Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Issue 1127233005: Don't include tested apks resources in test apk (Closed)

Created:
5 years, 7 months ago by cjhopman
Modified:
5 years, 6 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, feature-media-reviews_chromium.org, klundberg+watch_chromium.org, yfriedman+watch_chromium.org, jbudorick+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Don't include tested apks resources in test apk This restricts the test apk's resources to just be those not already included in the tested apk. Because GN apk targets typically don't include java of their own, this requires supporting javac+jar for the case where there is no java files. Fixes deps so that chrome_shell_test_apk actually builds. TBR=nyquist,dalecurtis,cbentzel BUG=359249 Committed: https://crrev.com/d4910aba370e4e5d55477b4b857c707d07526f7b Cr-Commit-Position: refs/heads/master@{#329510}

Patch Set 1 #

Total comments: 1

Patch Set 2 : #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+70 lines, -41 lines) Patch
M build/android/gyp/jar.py View 1 chunk +14 lines, -10 lines 1 comment Download
M build/android/gyp/jar_toc.py View 1 chunk +4 lines, -2 lines 0 comments Download
M build/android/gyp/javac.py View 1 chunk +6 lines, -5 lines 0 comments Download
M build/android/gyp/write_build_config.py View 1 4 chunks +39 lines, -15 lines 0 comments Download
M chrome/android/BUILD.gn View 2 chunks +2 lines, -0 lines 0 comments Download
M components/invalidation/BUILD.gn View 1 chunk +1 line, -4 lines 0 comments Download
M media/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M net/BUILD.gn View 1 chunk +1 line, -4 lines 0 comments Download
M net/android/BUILD.gn View 1 chunk +3 lines, -0 lines 0 comments Download

Messages

Total messages: 14 (7 generated)
cjhopman
newt: *
5 years, 7 months ago (2015-05-12 00:34:59 UTC) #2
newt (away)
lgtm https://codereview.chromium.org/1127233005/diff/1/build/android/gyp/write_build_config.py File build/android/gyp/write_build_config.py (right): https://codereview.chromium.org/1127233005/diff/1/build/android/gyp/write_build_config.py#newcode86 build/android/gyp/write_build_config.py:86: class Deps(object): more blank lines!
5 years, 7 months ago (2015-05-12 01:01:24 UTC) #3
cjhopman
TBRed: cbentzel net/ nyquist components/invalidation dalecurtis media/
5 years, 7 months ago (2015-05-12 21:08:24 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1127233005/20001
5 years, 7 months ago (2015-05-12 21:09:58 UTC) #10
commit-bot: I haz the power
Committed patchset #2 (id:20001)
5 years, 7 months ago (2015-05-12 22:23:58 UTC) #11
commit-bot: I haz the power
Patchset 2 (id:??) landed as https://crrev.com/d4910aba370e4e5d55477b4b857c707d07526f7b Cr-Commit-Position: refs/heads/master@{#329510}
5 years, 7 months ago (2015-05-12 22:24:49 UTC) #12
mef
5 years, 6 months ago (2015-06-03 21:56:27 UTC) #14
Message was sent while issue was closed.
https://codereview.chromium.org/1127233005/diff/20001/build/android/gyp/jar.py
File build/android/gyp/jar.py (right):

https://codereview.chromium.org/1127233005/diff/20001/build/android/gyp/jar.p...
build/android/gyp/jar.py:33: jar_cmd.append(os.path.relpath(empty_file,
jar_cwd))
This results in files like ../../tmpPrZEqC/.empty being added to the jar. Is
this intentional?

Powered by Google App Engine
This is Rietveld 408576698