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

Issue 295473002: Remove apk-codegen.xml (Closed)

Created:
6 years, 7 months ago by cjhopman
Modified:
6 years, 6 months ago
Reviewers:
Yaron
CC:
chromium-reviews, klundberg+watch_chromium.org, bulach+watch_chromium.org, yfriedman+watch_chromium.org, ilevy-cc_chromium.org, newt (away)
Visibility:
Public.

Description

Remove apk-codegen.xml process_resources.py already implements almost everything from apk-codegen.xml so just use that instead. BUG=359249, 375324, 375431 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272783

Patch Set 1 : #

Total comments: 6

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : Fix build_utils.CheckOptions #

Patch Set 5 : Rebase #

Patch Set 6 : Fix for apks with no resources #

Patch Set 7 : Fix resource directory ordering #

Patch Set 8 : :/ #

Patch Set 9 : Fix proguard.txt #

Unified diffs Side-by-side diffs Delta from patch set Stats (+101 lines, -167 lines) Patch
M build/android/ant/apk-codegen.xml View 1 chunk +0 lines, -98 lines 0 comments Download
M build/android/ant/apk-obfuscate.xml View 1 2 3 4 5 6 7 8 1 chunk +0 lines, -1 line 0 comments Download
M build/android/ant/apk-package-resources.xml View 3 chunks +3 lines, -29 lines 0 comments Download
M build/android/gyp/process_resources.py View 1 2 3 4 5 6 7 8 4 chunks +64 lines, -8 lines 0 comments Download
M build/android/gyp/util/build_utils.py View 1 2 3 1 chunk +1 line, -1 line 0 comments Download
M build/java.gypi View 2 chunks +4 lines, -4 lines 0 comments Download
M build/java_apk.gypi View 1 2 3 4 5 6 7 8 3 chunks +29 lines, -26 lines 0 comments Download

Messages

Total messages: 29 (0 generated)
cjhopman
6 years, 7 months ago (2014-05-17 01:45:09 UTC) #1
cjhopman
yfriedman: *
6 years, 7 months ago (2014-05-17 01:45:36 UTC) #2
Yaron
https://codereview.chromium.org/295473002/diff/30001/build/android/gyp/process_resources.py File build/android/gyp/process_resources.py (right): https://codereview.chromium.org/295473002/diff/30001/build/android/gyp/process_resources.py#newcode31 build/android/gyp/process_resources.py:31: help='directory containing images to be crunched') isn't this all ...
6 years, 7 months ago (2014-05-19 18:33:00 UTC) #3
cjhopman
https://codereview.chromium.org/295473002/diff/30001/build/android/gyp/process_resources.py File build/android/gyp/process_resources.py (right): https://codereview.chromium.org/295473002/diff/30001/build/android/gyp/process_resources.py#newcode31 build/android/gyp/process_resources.py:31: help='directory containing images to be crunched') On 2014/05/19 18:33:00, ...
6 years, 7 months ago (2014-05-20 20:40:41 UTC) #4
Yaron
lgtm
6 years, 7 months ago (2014-05-20 21:16:26 UTC) #5
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 7 months ago (2014-05-20 21:17:45 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/295473002/70001
6 years, 7 months ago (2014-05-20 21:19:07 UTC) #7
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are ...
6 years, 7 months ago (2014-05-21 03:19:34 UTC) #8
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 7 months ago (2014-05-21 15:38:21 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/295473002/90001
6 years, 7 months ago (2014-05-21 19:57:06 UTC) #10
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 7 months ago (2014-05-21 20:44:20 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/295473002/100001
6 years, 7 months ago (2014-05-21 20:47:29 UTC) #12
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are ...
6 years, 7 months ago (2014-05-22 04:39:19 UTC) #13
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-22 05:14:07 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: android_clang_dbg on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_clang_dbg/builds/144831)
6 years, 7 months ago (2014-05-22 05:14:08 UTC) #15
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 7 months ago (2014-05-22 18:53:47 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/295473002/120001
6 years, 7 months ago (2014-05-22 18:56:19 UTC) #17
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are ...
6 years, 7 months ago (2014-05-22 23:00:14 UTC) #18
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-23 00:28:02 UTC) #19
commit-bot: I haz the power
Try jobs failed on following builders: android_dbg_triggered_tests on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered_tests/builds/156395)
6 years, 7 months ago (2014-05-23 00:28:03 UTC) #20
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 7 months ago (2014-05-24 00:42:17 UTC) #21
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/295473002/140001
6 years, 7 months ago (2014-05-24 00:43:01 UTC) #22
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are ...
6 years, 7 months ago (2014-05-24 06:44:12 UTC) #23
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 7 months ago (2014-05-24 06:49:05 UTC) #24
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/chromium_presubmit/builds/69646)
6 years, 7 months ago (2014-05-24 06:49:06 UTC) #25
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 7 months ago (2014-05-25 23:16:55 UTC) #26
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/295473002/160001
6 years, 7 months ago (2014-05-25 23:17:05 UTC) #27
commit-bot: I haz the power
Change committed as 272783
6 years, 7 months ago (2014-05-26 04:19:37 UTC) #28
tapted
6 years, 7 months ago (2014-05-26 05:09:15 UTC) #29
Message was sent while issue was closed.
A revert of this CL has been created in
https://codereview.chromium.org/301543002/ by tapted@chromium.org.

The reason for reverting is: Suspected for android compile failure on waterfall
starting

http://build.chromium.org/p/chromium/builders/Android/builds/24321

Errors are pretty obscure. Things like

BUILD FAILED
/b/build/slave/Android/build/src/build/android/ant/apk-obfuscate.xml:161:
/b/build/slave/Android/build/src/out/Release/multiple_proguards_test_apk/proguard.txt
(No such file or directory)
	at proguard.ant.ConfigurationTask.addText(ConfigurationTask.java:315)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

FAILED: cd ../../build/android/tests/multiple_proguards; /*snip*/
build/android/ant/apk-obfuscate.xml
Traceback (most recent call last):
  File "../../../../build/android/gyp/ant.py", line 34, in main
    stdout = build_utils.CheckOutput(['ant'] + verbose_args)
  File "/b/build/slave/Android/build/src/build/android/gyp/util/build_utils.py",
line 113, in CheckOutput
    raise CalledProcessError(cwd, args, stdout + stderr).

Powered by Google App Engine
This is Rietveld 408576698