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

Side by Side Diff: chrome/android/BUILD.gn

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 | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('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("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//chrome/android/chrome_public_apk_tmpl.gni") 8 import("//chrome/android/chrome_public_apk_tmpl.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//chrome/version.gni") 10 import("//chrome/version.gni")
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 sources = chrome_apk_gypi.chrome_sync_shell_app_native_sources 464 sources = chrome_apk_gypi.chrome_sync_shell_app_native_sources
465 } 465 }
466 466
467 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk 467 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
468 template("chrome_public_apk_tmpl_shared") { 468 template("chrome_public_apk_tmpl_shared") {
469 chrome_public_apk_tmpl(target_name) { 469 chrome_public_apk_tmpl(target_name) {
470 forward_variables_from(invoker, "*") 470 forward_variables_from(invoker, "*")
471 471
472 native_lib_version_rule = "//build/util:chrome_version_json" 472 native_lib_version_rule = "//build/util:chrome_version_json"
473 473
474 # Only attempt loading the library from the APK for 64 bit devices
475 # until the number of 32 bit devices which don't support this
476 # approach falls to a minimal level - http://crbug.com/390618.
477 if (chromium_linker_supported &&
478 (target_cpu == "arm64" || target_cpu == "x64")) {
479 load_library_from_apk = chrome_public_apk_load_library_from_apk
480 }
481
482 deps += [ 474 deps += [
483 ":chrome_java", 475 ":chrome_java",
484 ":chrome_public_apk_assets", 476 ":chrome_public_apk_assets",
485 ":chrome_public_apk_resources", 477 ":chrome_public_apk_resources",
486 "//base:base_java", 478 "//base:base_java",
487 google_play_services_resources, 479 google_play_services_resources,
488 ] 480 ]
489 } 481 }
490 } 482 }
491 483
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 apk_name = "ChromeSyncShellTest" 579 apk_name = "ChromeSyncShellTest"
588 apk_under_test = ":chrome_sync_shell_apk" 580 apk_under_test = ":chrome_sync_shell_apk"
589 android_manifest = chrome_sync_shell_test_apk_manifest 581 android_manifest = chrome_sync_shell_test_apk_manifest
590 deps = [ 582 deps = [
591 ":chrome_sync_shell_test_apk_java", 583 ":chrome_sync_shell_test_apk_java",
592 ":chrome_sync_shell_test_apk_manifest", 584 ":chrome_sync_shell_test_apk_manifest",
593 ] 585 ]
594 isolate_file = "../chrome_sync_shell_test_apk.isolate" 586 isolate_file = "../chrome_sync_shell_test_apk.isolate"
595 proguard_enabled = !is_debug 587 proguard_enabled = !is_debug
596 } 588 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698