applied patch android_build.patch
This commit is contained in:
parent
82210ef89a
commit
04fddf4efa
@ -184,7 +184,7 @@ class ANDROID_SDK_VERSION_CODES(object):
|
|||||||
LOLLIPOP_MR1 = 22
|
LOLLIPOP_MR1 = 22
|
||||||
|
|
||||||
ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP_MR1
|
ANDROID_SDK_VERSION = ANDROID_SDK_VERSION_CODES.LOLLIPOP_MR1
|
||||||
ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.0'
|
ANDROID_SDK_BUILD_TOOLS_VERSION = '22.0.1'
|
||||||
ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
|
ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
|
||||||
'third_party/android_tools/sdk')
|
'third_party/android_tools/sdk')
|
||||||
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
|
ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
|
||||||
|
@ -17,7 +17,7 @@ if (is_android) {
|
|||||||
if (!defined(default_android_sdk_root)) {
|
if (!defined(default_android_sdk_root)) {
|
||||||
default_android_sdk_root = "//third_party/android_tools/sdk"
|
default_android_sdk_root = "//third_party/android_tools/sdk"
|
||||||
default_android_sdk_version = "22"
|
default_android_sdk_version = "22"
|
||||||
default_android_sdk_build_tools_version = "22.0.0"
|
default_android_sdk_build_tools_version = "22.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!defined(google_play_services_library)) {
|
if (!defined(google_play_services_library)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user