diff options
| author | yusufo <yusufo@chromium.org> | 2015-10-27 11:19:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 18:20:15 +0000 |
| commit | 8356eb404a31149079621a7fe95e79bea4c9fb3e (patch) | |
| tree | 39346a02e4015a3684b42b4443edaa64ff48ea1d /build | |
| parent | bc808d5d314a6dca042f94c018ca6b520fc8e787 (diff) | |
| download | chromium_src-8356eb404a31149079621a7fe95e79bea4c9fb3e.zip chromium_src-8356eb404a31149079621a7fe95e79bea4c9fb3e.tar.gz chromium_src-8356eb404a31149079621a7fe95e79bea4c9fb3e.tar.bz2 | |
Roll android_tools deps
Sets the build-tools version.
Renames two resources due to resource name clashes with mediarouter
resources
Adds recyclerview as a dependency to design in gn.
BUG=537270
Review URL: https://codereview.chromium.org/1419533002
Cr-Commit-Position: refs/heads/master@{#356346}
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/constants/__init__.py | 2 | ||||
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/config/android/config.gni | 2 | ||||
| -rw-r--r-- | build/secondary/third_party/android_tools/BUILD.gn | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py index 6be2efb..0b61403 100644 --- a/build/android/pylib/constants/__init__.py +++ b/build/android/pylib/constants/__init__.py @@ -156,7 +156,7 @@ DEVICE_PERF_OUTPUT_DIR = ( SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots') ANDROID_SDK_VERSION = version_codes.MARSHMALLOW -ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.0' +ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.1' ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT, 'third_party', 'android_tools', 'sdk') ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT, diff --git a/build/common.gypi b/build/common.gypi index 5b05435..eaba251 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1718,7 +1718,7 @@ 'android_host_arch%': '<!(uname -m)', # Android API-level of the SDK used for compilation. 'android_sdk_version%': '23', - 'android_sdk_build_tools_version%': '23.0.0', + 'android_sdk_build_tools_version%': '23.0.1', 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", 'conditions': [ diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 7ca1b70..19ed535 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -17,7 +17,7 @@ if (is_android) { if (!defined(default_android_sdk_root)) { default_android_sdk_root = "//third_party/android_tools/sdk" default_android_sdk_version = "23" - default_android_sdk_build_tools_version = "23.0.0" + default_android_sdk_build_tools_version = "23.0.1" } if (!defined(default_android_keystore_path)) { diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn index 4e38b93..c777fbd 100644 --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn @@ -33,6 +33,7 @@ android_resources("android_support_design_resources") { resource_dirs = [ "$android_sdk_root/extras/android/support/design/res" ] deps = [ ":android_support_v7_appcompat_resources", + ":android_support_v7_recyclerview_resources", ] custom_package = "android.support.design" } |