Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index ec9977b8240a45b7a91217a3a636e9cdb41c1620..7920341b9854b2024e426369f31f5b9748176b98 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1623,7 +1623,6 @@ |
# they're passed to ant which uses a different relative path from |
# gyp. |
'android_ndk_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/', |
- 'android_ndk_experimental_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk_experimental/', |
'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. |
@@ -1655,11 +1654,10 @@ |
}], |
['target_arch == "x64"', { |
'android_app_abi%': 'x86_64', |
- 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-x86_64/gdbserver/gdbserver', |
- 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-L/arch-x86_64', |
+ 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver', |
+ 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-x86_64', |
'android_ndk_lib_dir%': 'usr/lib64', |
- 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', |
- 'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport', |
+ 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', |
}], |
['target_arch=="arm"', { |
'conditions': [ |
@@ -1676,11 +1674,10 @@ |
}], |
['target_arch == "arm64"', { |
'android_app_abi%': 'arm64-v8a', |
- 'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-arm64/gdbserver/gdbserver', |
- 'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-L/arch-arm64', |
+ 'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/gdbserver/gdbserver', |
+ 'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-arm64', |
'android_ndk_lib_dir%': 'usr/lib', |
- 'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', |
- 'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport', |
+ 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', |
}], |
['target_arch == "mipsel"', { |
'android_app_abi%': 'mips', |