summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorianwen <ianwen@chromium.org>2016-03-21 18:03:29 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 01:05:15 +0000
commit3bc8338191cdc2369891ca26a773f91dafe77732 (patch)
tree8598afa5d5145627fe54ec6507561215c96994e7 /build
parent88b29940f9a45d9669e32d4afb28318a54106149 (diff)
downloadchromium_src-3bc8338191cdc2369891ca26a773f91dafe77732.zip
chromium_src-3bc8338191cdc2369891ca26a773f91dafe77732.tar.gz
chromium_src-3bc8338191cdc2369891ca26a773f91dafe77732.tar.bz2
Roll third_party/android_tools, updating support lib to 23.2.1
BUG=415300 Review URL: https://codereview.chromium.org/1809893002 Cr-Commit-Position: refs/heads/master@{#382468}
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/gyp/package_resources.py1
-rwxr-xr-xbuild/android/gyp/process_resources.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/build/android/gyp/package_resources.py b/build/android/gyp/package_resources.py
index 536d5e5..08a2537 100755
--- a/build/android/gyp/package_resources.py
+++ b/build/android/gyp/package_resources.py
@@ -227,6 +227,7 @@ def _ConstructMostAaptArgs(options):
'--no-crunch',
'-f',
'--auto-add-overlay',
+ '--no-version-vectors',
'-I', options.android_sdk_jar,
'-F', options.apk_path,
'--ignore-assets', build_utils.AAPT_IGNORE_PATTERN,
diff --git a/build/android/gyp/process_resources.py b/build/android/gyp/process_resources.py
index 36e80d4..9297a47 100755
--- a/build/android/gyp/process_resources.py
+++ b/build/android/gyp/process_resources.py
@@ -379,6 +379,7 @@ def _OnStaleMd5(options):
'-m',
'-M', options.android_manifest,
'--auto-add-overlay',
+ '--no-version-vectors',
'-I', options.android_sdk_jar,
'--output-text-symbols', gen_dir,
'-J', gen_dir,