summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-16 16:47:46 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-16 16:47:46 +0000
commit98f6b83410786767d15914e8a5bed65479d34a45 (patch)
treec76538238547d9379d71eaff96b5f8b7d4a00967 /build
parentf9c07f5dacecbaa1346e19c52dadbefa079e5911 (diff)
downloadchromium_src-98f6b83410786767d15914e8a5bed65479d34a45.zip
chromium_src-98f6b83410786767d15914e8a5bed65479d34a45.tar.gz
chromium_src-98f6b83410786767d15914e8a5bed65479d34a45.tar.bz2
Merge 280725 "Fix generation of v14 resources"
> Fix generation of v14 resources > > generate_v14_compatible_resources.GenerateV14Resources was deleting and > recreating the output directory. process_resources was calling that > multiple times and reusing the same output directory (and so it would > only actually get v14 resources for the final directory). > > Instead, callers of GenerateV14Resources should handle deleting/creating > the output directory for themselves--this is just > generate_v14_compatible_resources.main and process_resources (which was > already handling this itself). > > BUG=383803 > > Review URL: https://codereview.chromium.org/362543004 TBR=cjhopman@chromium.org Review URL: https://codereview.chromium.org/396243003 git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@283409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/gyp/generate_v14_compatible_resources.py11
-rw-r--r--build/java_apk.gypi2
2 files changed, 7 insertions, 6 deletions
diff --git a/build/android/gyp/generate_v14_compatible_resources.py b/build/android/gyp/generate_v14_compatible_resources.py
index 03874f0..1961622 100755
--- a/build/android/gyp/generate_v14_compatible_resources.py
+++ b/build/android/gyp/generate_v14_compatible_resources.py
@@ -281,9 +281,6 @@ def ParseArgs():
return options
def GenerateV14Resources(res_dir, res_v14_dir, verify_only):
- build_utils.DeleteDirectory(res_v14_dir)
- build_utils.MakeDirectory(res_v14_dir)
-
for name in os.listdir(res_dir):
if not os.path.isdir(os.path.join(res_dir, name)):
continue
@@ -337,8 +334,12 @@ def GenerateV14Resources(res_dir, res_v14_dir, verify_only):
def main():
options = ParseArgs()
- GenerateV14Resources(
- options.res_dir, options.res_v14_compatibility_dir, options.verify_only)
+ res_v14_dir = options.res_v14_compatibility_dir
+
+ build_utils.DeleteDirectory(res_v14_dir)
+ build_utils.MakeDirectory(res_v14_dir)
+
+ GenerateV14Resources(options.res_dir, res_v14_dir, options.verify_only)
if options.stamp:
build_utils.Touch(options.stamp)
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 92c8cfa..bef0811 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -495,7 +495,7 @@
'--proguard-file', '<(generated_proguard_file)',
- '--resource-dir', '<(resource_dir)',
+ '--resource-dirs', '<(resource_dir)',
'--resource-zip-out', '<(resource_zip_path)',
'--R-dir', '<(intermediate_dir)/gen',