diff options
| author | dcaiafa <dcaiafa@chromium.org> | 2015-10-27 12:07:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 19:09:35 +0000 |
| commit | de6b09140fd5cbf679ddbbe37d206848ab15d421 (patch) | |
| tree | f2c9494220da88396b283fc0e5e801fb8b5d2518 /build | |
| parent | f38efa9db8bf4698cf4e0e68c2c4225efcb3081e (diff) | |
| download | chromium_src-de6b09140fd5cbf679ddbbe37d206848ab15d421.zip chromium_src-de6b09140fd5cbf679ddbbe37d206848ab15d421.tar.gz chromium_src-de6b09140fd5cbf679ddbbe37d206848ab15d421.tar.bz2 | |
Revert of Roll android_tools deps (patchset #4 id:60001 of https://codereview.chromium.org/1419533002/ )
Reason for revert:
Potential cause of break:
http://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/3804
Original issue's description:
> 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
>
> Committed: https://crrev.com/8356eb404a31149079621a7fe95e79bea4c9fb3e
> Cr-Commit-Position: refs/heads/master@{#356346}
TBR=dfalcantara@chromium.org,aurimas@chromium.org,jbudorick@chromium.org,yusufo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=537270
Review URL: https://codereview.chromium.org/1411783009
Cr-Commit-Position: refs/heads/master@{#356360}
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, 3 insertions, 4 deletions
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py index 0b61403..6be2efb 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.1' +ANDROID_SDK_BUILD_TOOLS_VERSION = '23.0.0' 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 eaba251..5b05435 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.1', + 'android_sdk_build_tools_version%': '23.0.0', '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 19ed535..7ca1b70 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.1" + default_android_sdk_build_tools_version = "23.0.0" } 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 c777fbd..4e38b93 100644 --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn @@ -33,7 +33,6 @@ 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" } |