Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1504)

Unified Diff: build/config/android/config.gni

Issue 659703002: GN: Some small changes to support chrome android internal stuff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-packed
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « BUILD.gn ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 50cf8ba19afd890bce2dfbda28e9e145c780d1e5..e602083fc3e3d9e2b18efc0ee74250f3caee51c4 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -5,12 +5,25 @@
# This file contains common system config stuff for the Android build.
if (is_android) {
+ has_chrome_android_internal = exec_script("//build/dir_exists.py",
+ [ rebase_path("//clank", root_build_dir) ],
+ "string") == "True"
+
+ if (has_chrome_android_internal) {
+ import("//clank/config.gni")
+ } else {
+ default_android_sdk_root = "//third_party/android_tools/sdk"
+ default_android_sdk_version = "21"
+ default_android_sdk_build_tools_version = "21.0.0"
+ }
+
declare_args() {
# Absolute directory containing the Android source code.
android_src = ""
- android_sdk_root = "//third_party/android_tools/sdk"
- android_sdk_version = "21"
+ android_sdk_root = default_android_sdk_root
+ android_sdk_version = default_android_sdk_version
+ android_sdk_build_tools_version = default_android_sdk_build_tools_version
# This is set when building the Android WebView inside the Android build
# system, using the 'android' gyp backend. The WebView code is still built
@@ -32,7 +45,6 @@ if (is_android) {
"You must specify android_src for an Android WebView build.")
}
-
# Host stuff -----------------------------------------------------------------
# Defines the name the Android build gives to the current host CPU
@@ -68,7 +80,7 @@ if (is_android) {
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/21.0.0"
+ android_sdk_build_tools = "${android_sdk_root}/build-tools/$android_sdk_build_tools_version"
# Path to the SDK's android.jar
android_sdk_jar = "$android_sdk/android.jar"
« no previous file with comments | « BUILD.gn ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698