From 98aa770867467633ba2de2e5a75b82e885148232 Mon Sep 17 00:00:00 2001 From: "johnme@chromium.org" Date: Fri, 6 Jun 2014 14:23:28 +0000 Subject: Revert of Add creation of v14 compatible resources to process_resources.py (https://codereview.chromium.org/321453002/) Reason for revert: This is causing instrumentation-yakju-clankium-tot and clang-clankium-tot-builder (downstream) to fail with the following error message: FAILED: cd ../../clank/native/framework; python ../../../build/android/gyp/process_resources.py --android-sdk /b/build/slave/instrumentation-yakju-clankium-tot/build/src/third_party/android_tools/sdk//platforms/android-19 --android-sdk-tools /b/build/slave/instrumentation-yakju-clankium-tot/build/src/third_party/android_tools/sdk//build-tools/19.0.0 --android-manifest ../../../clank/java/apps/deviceextras/AndroidManifest.xml --dependencies-res-dirs "" --extra-res-packages "" --extra-r-text-files "" --proguard-file ../../../out/Debug/device_extras_apk/proguard.txt --resource-dir ../../../clank/java/apps/deviceextras/res --res-v14-compatibility-dir ../../../out/Debug/device_extras_apk/res_v14_compatibility --crunch-output-dir ../../../out/Debug/device_extras_apk/res --R-dir ../../../out/Debug/device_extras_apk/gen --stamp ../../../out/Debug/device_extras_apk/codegen.stamp Traceback (most recent call last): File "../../../build/android/gyp/process_resources.py", line 217, in main() File "../../../build/android/gyp/process_resources.py", line 166, in main options.v14_verify_only) File "/b/build/slave/instrumentation-yakju-clankium-tot/build/src/build/android/gyp/generate_v14_compatible_resources.py", line 335, in GenerateV14Resources ErrorIfStyleResourceExistsInDir(input_dir) File "/b/build/slave/instrumentation-yakju-clankium-tot/build/src/build/android/gyp/generate_v14_compatible_resources.py", line 107, in ErrorIfStyleResourceExistsInDir '-v17 directory. Please refer to ' Exception: error: style file /b/build/slave/instrumentation-yakju-clankium-tot/build/src/clank/java/apps/deviceextras/res/values/styles.xml should be under /b/build/slave/instrumentation-yakju-clankium-tot/build/src/clank/java/apps/deviceextras/res/values-v17 directory. Please refer to http://crbug.com/243952 for the details. I don't know resource loading well enough to tell if that's a legitimate issue or not; so for now reverting this to fix the build bots, and if it is a legitimate issue then ideally it could be fixed before relanding this? Original issue's description: > Add creation of v14 compatible resources to process_resources.py > > There are a lot of steps in processing resources and preparing them for > packaging. It will be easier if these are all done by the same script. > > BUG=375431,359249 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=275401 TBR=newt@chromium.org,cjhopman@chromium.org NOTREECHECKS=true NOTRY=true BUG=375431,359249 Review URL: https://codereview.chromium.org/314363002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275436 0039d316-1c4b-4281-b951-d872f2087c98 --- build/java.gypi | 48 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 12 deletions(-) (limited to 'build/java.gypi') diff --git a/build/java.gypi b/build/java.gypi index a67c836..d392206 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -111,6 +111,7 @@ 'variables': { 'res_dir': '<(java_in_dir)/res', 'res_crunched_dir': '<(intermediate_dir)/res_crunched', + 'res_v14_compatibility_stamp': '<(intermediate_dir)/res_v14_compatibility.stamp', 'res_v14_compatibility_dir': '<(intermediate_dir)/res_v14_compatibility', 'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'], 'resource_input_paths': ['@(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))', - 'process_resources_options': [], - 'conditions': [ - ['res_v14_verify_only == 1', { - 'process_resources_options': ['--v14-verify-only'] - }], - ], + 'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))' }, 'inputs': [ '<(DEPTH)/build/android/gyp/util/build_utils.py', '<(DEPTH)/build/android/gyp/process_resources.py', - '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py', '>@(resource_input_paths)', '>@(dependencies_res_files)', '>(inputs_list_file)', @@ -188,15 +184,43 @@ '--R-dir', '<(R_dir)', '--dependencies-res-dirs', '>(dependencies_res_dirs)', '--resource-dir', '<(res_dir)', - '--res-v14-compatibility-dir', '<(res_v14_compatibility_dir)', '--crunch-output-dir', '<(res_crunched_dir)', '--android-manifest', '<(android_manifest)', '--non-constant-id', '--custom-package', '<(R_package)', '--stamp', '<(R_stamp)', - '<@(process_resources_options)', ], }, + # Generate API 14 resources. + { + 'action_name': 'generate_api_14_resources_<(_target_name)', + 'message': 'Generating Android API 14 resources <(_target_name)', + 'variables' : { + 'res_v14_additional_options': [], + }, + 'conditions': [ + ['res_v14_verify_only == 1', { + 'variables': { + 'res_v14_additional_options': ['--verify-only'] + }, + }], + ], + 'inputs': [ + '<(DEPTH)/build/android/gyp/util/build_utils.py', + '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py', + '>@(resource_input_paths)', + ], + 'outputs': [ + '<(res_v14_compatibility_stamp)', + ], + 'action': [ + 'python', '<(DEPTH)/build/android/gyp/generate_v14_compatible_resources.py', + '--res-dir=<(res_dir)', + '--res-v14-compatibility-dir=<(res_v14_compatibility_dir)', + '--stamp', '<(res_v14_compatibility_stamp)', + '<@(res_v14_additional_options)', + ] + }, ], }], ['proguard_preprocess == 1', { -- cgit v1.1