diff options
| -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', |