From 29ad1982922c47da7645f738a88b4ad4009e73ad Mon Sep 17 00:00:00 2001 From: "tapted@chromium.org" Date: Mon, 26 May 2014 05:10:41 +0000 Subject: Revert of Remove apk-codegen.xml (https://codereview.chromium.org/295473002/) Reason for revert: 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) Original issue's 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 TBR=yfriedman@chromium.org,cjhopman@chromium.org NOTREECHECKS=true NOTRY=true BUG=359249,375324,375431 Review URL: https://codereview.chromium.org/301543002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272795 0039d316-1c4b-4281-b951-d872f2087c98 --- build/java.gypi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build/java.gypi') diff --git a/build/java.gypi b/build/java.gypi index ce778b1..8f61395 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -156,8 +156,8 @@ 'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml', # Include the dependencies' res dirs so that references to # resources in dependencies can be resolved. - 'dependencies_res_dirs': ['<@(res_extra_dirs)', - '>@(dependencies_res_input_dirs)',], + 'all_res_dirs': ['<@(res_input_dirs)', + '>@(dependencies_res_input_dirs)',], # Write the inputs list to a file, so that its mtime is updated when # the list of inputs changes. 'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))' @@ -177,8 +177,8 @@ '--android-sdk', '<(android_sdk)', '--android-sdk-tools', '<(android_sdk_tools)', '--R-dir', '<(R_dir)', - '--dependencies-res-dirs', '>(dependencies_res_dirs)', - '--resource-dir', '<(res_dir)', + '--res-dirs', '>(all_res_dirs)', + '--crunch-input-dir', '>(res_dir)', '--crunch-output-dir', '<(res_crunched_dir)', '--android-manifest', '<(android_manifest)', '--non-constant-id', -- cgit v1.1