| Index: build/config/android/config.gni
|
| diff --git a/build/config/android/config.gni b/build/config/android/config.gni
|
| index 35ffcccfe5d9e129db01cef0da11146463a75532..fdabcb5c6bbda73826b62668243d7f80cf8a5c85 100644
|
| --- a/build/config/android/config.gni
|
| +++ b/build/config/android/config.gni
|
| @@ -5,46 +5,16 @@
|
| # 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")
|
| - }
|
| -
|
| if (!defined(default_android_sdk_root)) {
|
| default_android_sdk_root = "//third_party/android_tools/sdk"
|
| default_android_sdk_version = "22"
|
| default_android_sdk_build_tools_version = "22.0.1"
|
| }
|
|
|
| - if (!defined(google_play_services_library)) {
|
| - google_play_services_library =
|
| - "//third_party/android_tools:google_play_services_default_java"
|
| - }
|
| -
|
| declare_args() {
|
| 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
|
| -
|
| - android_default_keystore_path =
|
| - "//build/android/ant/chromium-debug.keystore"
|
| - android_default_keystore_name = "chromiumdebugkey"
|
| - android_default_keystore_password = "chromium"
|
| -
|
| - # This is a unique identifier for a given build. It's used for
|
| - # identifying various build artifacts corresponding to a particular build of
|
| - # chrome (e.g. where to find archived symbols).
|
| - android_chrome_build_id = "\"\""
|
| -
|
| - # Set to true to run findbugs on JAR targets.
|
| - run_findbugs = false
|
| -
|
| - # Set to true to enable the Errorprone compiler
|
| - use_errorprone_java_compiler = false
|
| }
|
|
|
| # Host stuff -----------------------------------------------------------------
|
|
|