diff options
| author | aurimas@google.com <aurimas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 18:53:45 +0000 |
|---|---|---|
| committer | aurimas@google.com <aurimas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 18:53:45 +0000 |
| commit | 89659068555fcc9905081a0e05d6310c54538802 (patch) | |
| tree | 39c32495ce18610769e2cb748aace629b7e6f6ae /build | |
| parent | b8fff6a92e265bdc32ceb34238fda23e1fc71406 (diff) | |
| download | chromium_src-89659068555fcc9905081a0e05d6310c54538802.zip chromium_src-89659068555fcc9905081a0e05d6310c54538802.tar.gz chromium_src-89659068555fcc9905081a0e05d6310c54538802.tar.bz2 | |
Merge 283526 "Roll Android SDK to v20"
> Roll Android SDK to v20
>
> BUG=393019
> NOTRY=true
>
> Review URL: https://codereview.chromium.org/394593002
TBR=aurimas@chromium.org
Review URL: https://codereview.chromium.org/402733002
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@283829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/constants.py | 4 | ||||
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/config/android/config.gni | 15 |
3 files changed, 15 insertions, 6 deletions
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py index cb026da..a41438c 100644 --- a/build/android/pylib/constants.py +++ b/build/android/pylib/constants.py @@ -133,8 +133,8 @@ DEVICE_PERF_OUTPUT_DIR = ( SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots') -ANDROID_SDK_VERSION = 19 -ANDROID_SDK_BUILD_TOOLS_VERSION = '19.0.0' +ANDROID_SDK_VERSION = 20 +ANDROID_SDK_BUILD_TOOLS_VERSION = '20.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 b657907..e8ce1e2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1613,7 +1613,7 @@ 'android_sdk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/sdk/', 'android_host_arch%': '<!(uname -m)', # Android API-level of the SDK used for compilation. - 'android_sdk_version%': '19', + 'android_sdk_version%': '20', 'android_sdk_build_tools_version%': '20.0.0', 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", }, diff --git a/build/config/android/config.gni b/build/config/android/config.gni index 1e3601d..819fe4d 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -9,6 +9,9 @@ if (is_android) { # Absolute directory containing the Android source code. android_src = "" + android_sdk_root = "//third_party/android_tools/sdk" + android_sdk_version = "20" + # This is set when building the Android WebView inside the Android build # system, using the 'android' gyp backend. The WebView code is still built # when this is unset, but builds using the normal chromium build system. @@ -46,12 +49,18 @@ if (is_android) { # than just the current one) since these are needed by the Android toolchain # file to define toolchains for all possible targets in one pass. + android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" + # Path to the Android NDK and SDK. android_ndk_root = "//third_party/android_tools/ndk" - android_sdk_root = "//third_party/android_tools/sdk" + + android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" + + android_sdk_tools = "${android_sdk_root}/tools" + android_sdk_build_tools = "${android_sdk_root}/build-tools/20.0.0" # Path to the SDK's android.jar - android_sdk_jar = "$android_sdk_root/platforms/android-19/android.jar" + android_sdk_jar = "$android_sdk/android.jar" # Subdirectories inside android_ndk_root that contain the sysroot for the # associated platform. @@ -76,7 +85,7 @@ if (is_android) { } else if (cpu_arch == "arm") { android_libgcc_file = "$arm_android_toolchain_root/lib/gcc/arm-linux-androideabi/${_android_toolchain_version}/libgcc.a" - } else if (cpu_arch == "mips") { + } else if (cpu_arch == "mipsel") { android_libgcc_file = "$mips_android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain_version}/libgcc.a" } else { |