| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This file contains common system config stuff for the Android build. | 5 # This file contains common system config stuff for the Android build. |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 declare_args() { | 8 declare_args() { |
| 9 # Absolute directory containing the Android source code. | 9 # Absolute directory containing the Android source code. |
| 10 android_src = "" | 10 android_src = "" |
| 11 | 11 |
| 12 android_sdk_root = "//third_party/android_tools/sdk" |
| 13 android_sdk_version = "19" |
| 14 |
| 12 # This is set when building the Android WebView inside the Android build | 15 # This is set when building the Android WebView inside the Android build |
| 13 # system, using the 'android' gyp backend. The WebView code is still built | 16 # system, using the 'android' gyp backend. The WebView code is still built |
| 14 # when this is unset, but builds using the normal chromium build system. | 17 # when this is unset, but builds using the normal chromium build system. |
| 15 is_android_webview_build = false | 18 is_android_webview_build = false |
| 16 } | 19 } |
| 17 | 20 |
| 18 if (is_android_webview_build) { | 21 if (is_android_webview_build) { |
| 19 assert(android_src != "", | 22 assert(android_src != "", |
| 20 "You must specify android_src for an Android WebView build.") | 23 "You must specify android_src for an Android WebView build.") |
| 21 } | 24 } |
| 22 | 25 |
| 26 |
| 27 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" |
| 28 |
| 23 # android_ndk_root ----------------------------------------------------------- | 29 # android_ndk_root ----------------------------------------------------------- |
| 24 | 30 |
| 25 # Full system path to the Android NDK. | 31 # Full system path to the Android NDK. |
| 26 android_ndk_root = rebase_path("//third_party/android_tools/ndk") | 32 android_ndk_root = rebase_path("//third_party/android_tools/ndk") |
| 27 | 33 |
| 28 # stlport stuff -------------------------------------------------------------- | 34 # stlport stuff -------------------------------------------------------------- |
| 29 | 35 |
| 30 use_system_stlport = is_android_webview_build | 36 use_system_stlport = is_android_webview_build |
| 31 | 37 |
| 32 if (use_system_stlport) { | 38 if (use_system_stlport) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 52 android_app_abi = "mips" | 58 android_app_abi = "mips" |
| 53 } else { | 59 } else { |
| 54 assert(false, "Unknown Android ABI: " + cpu_arch) | 60 assert(false, "Unknown Android ABI: " + cpu_arch) |
| 55 } | 61 } |
| 56 } else { | 62 } else { |
| 57 if (!defined(is_android_webview_build)) { | 63 if (!defined(is_android_webview_build)) { |
| 58 is_android_webview_build = false | 64 is_android_webview_build = false |
| 59 } | 65 } |
| 60 use_system_stlport = false | 66 use_system_stlport = false |
| 61 } | 67 } |
| OLD | NEW |