summaryrefslogtreecommitdiffstats
path: root/build/grit_action.gypi
diff options
context:
space:
mode:
authorjohnme@chromium.org <johnme@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 14:23:28 +0000
committerjohnme@chromium.org <johnme@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 14:23:28 +0000
commit98aa770867467633ba2de2e5a75b82e885148232 (patch)
tree683e8594473e40a7ef57924f138031cfd0d57720 /build/grit_action.gypi
parent6722296e0433d51fc4a278dbd9c5546d7b5ae091 (diff)
downloadchromium_src-98aa770867467633ba2de2e5a75b82e885148232.zip
chromium_src-98aa770867467633ba2de2e5a75b82e885148232.tar.gz
chromium_src-98aa770867467633ba2de2e5a75b82e885148232.tar.bz2
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 <module> 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
Diffstat (limited to 'build/grit_action.gypi')
-rw-r--r--build/grit_action.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/grit_action.gypi b/build/grit_action.gypi
index ab7a70b..fef961f 100644
--- a/build/grit_action.gypi
+++ b/build/grit_action.gypi
@@ -10,7 +10,7 @@
# It would be really nice to do this with a rule instead of actions, but it
# would need to determine inputs and outputs via grit_info on a per-file
-# basis. GYP rules don't currently support that. They could be extended to
+# basis. GYP rules don’t currently support that. They could be extended to
# do this, but then every generator would need to be updated to handle this.
{