summaryrefslogtreecommitdiffstats
path: root/build/config/android/config.gni
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-08-06 14:38:58 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-06 21:39:37 +0000
commit2a08763777c45ca4e7a00a846266bbfed31ef673 (patch)
treeb8fc7d1fe0dba7ba115d0fd234664e829da7232e /build/config/android/config.gni
parentd3ecba547e9257db6004261e6c3df6dd0bcecc2f (diff)
downloadchromium_src-2a08763777c45ca4e7a00a846266bbfed31ef673.zip
chromium_src-2a08763777c45ca4e7a00a846266bbfed31ef673.tar.gz
chromium_src-2a08763777c45ca4e7a00a846266bbfed31ef673.tar.bz2
Pull ICU, rename component build GN variables.
This ICU roll only renames component_mode -> is_component_build Update other users of the component_mode string to is_component_build. Rename the declaration to be local to BUILDCONFIG.gn (prefixed with '_'). Removes a bitrotted GN unit test around component handing (it wasn't testing anything useful any more since we removed the built-in component function). Review URL: https://codereview.chromium.org/1275583002 Cr-Commit-Position: refs/heads/master@{#342204}
Diffstat (limited to 'build/config/android/config.gni')
-rw-r--r--build/config/android/config.gni8
1 files changed, 2 insertions, 6 deletions
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 32ac6d4..b0c7e48 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -165,17 +165,13 @@ if (is_android) {
# Toolchain stuff ------------------------------------------------------------
android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++"
- if (component_mode == "shared_library") {
+ if (is_component_build) {
android_libcpp_library = "c++_shared"
- } else {
- android_libcpp_library = "c++_static"
- }
-
- if (component_mode == "shared_library") {
# By appending .cr, we prevent name collisions with libraries already
# loaded by the Android zygote.
android_product_extension = ".cr.so"
} else {
+ android_libcpp_library = "c++_static"
android_product_extension = ".so"
}