diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 01:45:03 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-01 01:45:03 +0000 |
| commit | 41f0de1b72419cc400dd5144a102a9fdd5ed6f66 (patch) | |
| tree | ccff8afbdc13f287e4b6ace4f85403a59b8bc60c | |
| parent | f894cc04c9edfae2f94d3d74584453e98778884b (diff) | |
| download | chromium_src-41f0de1b72419cc400dd5144a102a9fdd5ed6f66.zip chromium_src-41f0de1b72419cc400dd5144a102a9fdd5ed6f66.tar.gz chromium_src-41f0de1b72419cc400dd5144a102a9fdd5ed6f66.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280725 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | build/android/gyp/generate_v14_compatible_resources.py | 11 | ||||
| -rw-r--r-- | build/java_apk.gypi | 2 |
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 1cb7ebc..4b0046b1 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -516,7 +516,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', |