summaryrefslogtreecommitdiff
path: root/chromium/build/android/gyp/dist_aar.py
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/build/android/gyp/dist_aar.py')
-rwxr-xr-xchromium/build/android/gyp/dist_aar.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/chromium/build/android/gyp/dist_aar.py b/chromium/build/android/gyp/dist_aar.py
index a74037af07a..fed1983b9ca 100755
--- a/chromium/build/android/gyp/dist_aar.py
+++ b/chromium/build/android/gyp/dist_aar.py
@@ -14,7 +14,7 @@ import sys
import tempfile
import zipfile
-from filter_zip import CreatePathTransform
+import filter_zip
from util import build_utils
@@ -117,8 +117,8 @@ def main(args):
build_utils.AddToZipHermetic(
z, 'AndroidManifest.xml', src_path=options.android_manifest)
- path_transform = CreatePathTransform(options.jar_excluded_globs,
- options.jar_included_globs, [])
+ path_transform = filter_zip.CreatePathTransform(
+ options.jar_excluded_globs, options.jar_included_globs, [])
with tempfile.NamedTemporaryFile() as jar_file:
build_utils.MergeZips(
jar_file.name, options.jars, path_transform=path_transform)
@@ -152,8 +152,7 @@ def main(args):
if options.depfile:
all_inputs = (options.jars + options.dependencies_res_zips +
options.r_text_files + options.proguard_configs)
- build_utils.WriteDepfile(options.depfile, options.output, all_inputs,
- add_pydeps=False)
+ build_utils.WriteDepfile(options.depfile, options.output, all_inputs)
if __name__ == '__main__':