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

Side by Side Diff: build/config/android/config.gni

Issue 571953002: android_webview: Build against NDK prebuilts, not system libraries. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix library link order on arm64 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 unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 = ""
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a" 112 "$android_toolchain_root/lib/gcc/mipsel-linux-android/${_android_toolchain _version}/libgcc.a"
113 } else { 113 } else {
114 assert(false, "Need android libgcc support for your target arch.") 114 assert(false, "Need android libgcc support for your target arch.")
115 } 115 }
116 116
117 android_readelf = "$android_toolchain_root/bin/$_binary_prefix-readelf" 117 android_readelf = "$android_toolchain_root/bin/$_binary_prefix-readelf"
118 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver" 118 android_gdbserver = "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserv er/gdbserver"
119 119
120 # stlport stuff -------------------------------------------------------------- 120 # stlport stuff --------------------------------------------------------------
121 121
122 use_system_stlport = is_android_webview_build 122 if (component_mode == "shared_library") {
123
124 if (use_system_stlport) {
125 android_stlport_library = "stlport"
126 } else if (component_mode == "shared_library") {
127 android_stlport_library = "stlport_shared" 123 android_stlport_library = "stlport_shared"
128 } else { 124 } else {
129 android_stlport_library = "stlport_static" 125 android_stlport_library = "stlport_static"
130 } 126 }
131 127
132 # ABI ------------------------------------------------------------------------ 128 # ABI ------------------------------------------------------------------------
133 129
134 if (cpu_arch == "x86") { 130 if (cpu_arch == "x86") {
135 android_app_abi = "x86" 131 android_app_abi = "x86"
136 } else if (cpu_arch == "arm") { 132 } else if (cpu_arch == "arm") {
137 import("//build/config/arm.gni") 133 import("//build/config/arm.gni")
138 if (arm_version < 7) { 134 if (arm_version < 7) {
139 android_app_abi = "armeabi" 135 android_app_abi = "armeabi"
140 } else { 136 } else {
141 android_app_abi = "armeabi-v7a" 137 android_app_abi = "armeabi-v7a"
142 } 138 }
143 } else if (cpu_arch == "mipsel") { 139 } else if (cpu_arch == "mipsel") {
144 android_app_abi = "mips" 140 android_app_abi = "mips"
145 } else { 141 } else {
146 assert(false, "Unknown Android ABI: " + cpu_arch) 142 assert(false, "Unknown Android ABI: " + cpu_arch)
147 } 143 }
148 } else { 144 } else {
149 if (!defined(is_android_webview_build)) { 145 if (!defined(is_android_webview_build)) {
150 is_android_webview_build = false 146 is_android_webview_build = false
151 } 147 }
152 use_system_stlport = false
153 } 148 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698