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

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

Issue 1690603003: Allow load_library_from_apk to be set via gn args (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | chrome/android/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 import("//base/android/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/internal_rules.gni") 7 import("//build/config/android/internal_rules.gni")
8 import("//build/config/sanitizers/sanitizers.gni") 8 import("//build/config/sanitizers/sanitizers.gni")
9 import("//build/toolchain/toolchain.gni") 9 import("//build/toolchain/toolchain.gni")
10 import("//third_party/android_platform/config.gni") 10 import("//third_party/android_platform/config.gni")
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1310 _keystore_name = invoker.keystore_name 1310 _keystore_name = invoker.keystore_name
1311 _keystore_password = invoker.keystore_password 1311 _keystore_password = invoker.keystore_password
1312 } 1312 }
1313 1313
1314 _srcjar_deps = [] 1314 _srcjar_deps = []
1315 if (defined(invoker.srcjar_deps)) { 1315 if (defined(invoker.srcjar_deps)) {
1316 _srcjar_deps += invoker.srcjar_deps 1316 _srcjar_deps += invoker.srcjar_deps
1317 } 1317 }
1318 1318
1319 _use_chromium_linker = 1319 _use_chromium_linker =
1320 defined(invoker.use_chromium_linker) && invoker.use_chromium_linker && 1320 defined(invoker.use_chromium_linker) && invoker.use_chromium_linker
1321 chromium_linker_supported 1321 _enable_relocation_packing = defined(invoker.enable_relocation_packing) &&
1322 _enable_relocation_packing = 1322 invoker.enable_relocation_packing
1323 defined(invoker.enable_relocation_packing) &&
1324 invoker.enable_relocation_packing && _use_chromium_linker
1325 _load_library_from_apk = 1323 _load_library_from_apk =
1326 defined(invoker.load_library_from_apk) && invoker.load_library_from_apk 1324 defined(invoker.load_library_from_apk) && invoker.load_library_from_apk
1327 1325
1328 assert(_use_chromium_linker || true) # Mark as used. 1326 assert(_use_chromium_linker || true) # Mark as used.
1329 assert(_enable_relocation_packing || true) # Mark as used. 1327 if (_enable_relocation_packing) {
1330 1328 assert(_use_chromium_linker,
1331 assert( 1329 "enable_relocation_packing requires use_chromium_linker")
1332 !_load_library_from_apk || _use_chromium_linker, 1330 }
1333 "Loading library from the apk requires use" + " of the Chromium linker.") 1331 if (_load_library_from_apk) {
1332 assert(_use_chromium_linker,
1333 "load_library_from_apk requires use_chromium_linker")
1334 }
1334 1335
1335 # The dependency that makes the chromium linker, if any is needed. 1336 # The dependency that makes the chromium linker, if any is needed.
1336 _native_libs_deps = [] 1337 _native_libs_deps = []
1337 1338
1338 if (defined(invoker.native_libs) && invoker.native_libs != []) { 1339 if (defined(invoker.native_libs) && invoker.native_libs != []) {
1339 if (is_component_build || is_asan) { 1340 if (is_component_build || is_asan) {
1340 _native_libs += [ "$root_shlib_dir/libc++_shared.so" ] 1341 _native_libs += [ "$root_shlib_dir/libc++_shared.so" ]
1341 _native_libs_deps += [ "//build/android:cpplib_stripped" ] 1342 _native_libs_deps += [ "//build/android:cpplib_stripped" ]
1342 } 1343 }
1343 1344
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after
2284 } 2285 }
2285 2286
2286 android_library(target_name) { 2287 android_library(target_name) {
2287 java_files = [] 2288 java_files = []
2288 srcjar_deps = [ ":${_template_name}__protoc_java" ] 2289 srcjar_deps = [ ":${_template_name}__protoc_java" ]
2289 deps = [ 2290 deps = [
2290 "//third_party/android_protobuf:protobuf_nano_javalib", 2291 "//third_party/android_protobuf:protobuf_nano_javalib",
2291 ] 2292 ]
2292 } 2293 }
2293 } 2294 }
OLDNEW
« no previous file with comments | « no previous file | chrome/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698