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

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

Issue 2161183003: Build libmonochrome.so with secondary toolchain (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove the v8_foo toolchain & address comments Created 4 years, 5 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/config.gni ('k') | no next file » | 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 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 ] 447 ]
448 448
449 if (is_android && use_order_profiling) { 449 if (is_android && use_order_profiling) {
450 deps += [ "//tools/cygprofile" ] 450 deps += [ "//tools/cygprofile" ]
451 } 451 }
452 452
453 public_configs = extra_chrome_shared_library_configs 453 public_configs = extra_chrome_shared_library_configs
454 } 454 }
455 455
456 # GYP: none 456 # GYP: none
457 if (!defined(webview_only_libmonochrome) || !webview_only_libmonochrome) { 457 #
458 # Only 32-bit //chrome/android/monochrome is needed, beside
459 # being built with 32-bit default toolchain, it is also built
460 # with secondary 32-bit toolchain in 64-bit platform because we
461 # need 64-bit //android_webview/monochrome and 32-bit this target
462 # for 64-bit APK.
463 if (!android_64bit_target_cpu ||
464 current_toolchain == android_secondary_abi_toolchain) {
458 shared_library("monochrome") { 465 shared_library("monochrome") {
459 sources = chrome_apk_gypi.monochrome_app_native_sources 466 sources = chrome_apk_gypi.monochrome_app_native_sources
460 deps = [ 467 deps = [
461 "//android_webview:common", 468 "//android_webview:common",
462 "//chrome:chrome_android_core", 469 "//chrome:chrome_android_core",
463 ] 470 ]
464 471
465 configs -= [ "//build/config/android:hide_native_jni_exports" ] 472 configs -= [ "//build/config/android:hide_native_jni_exports" ]
466 if (is_android && use_order_profiling) { 473 if (is_android && use_order_profiling) {
467 deps += [ "//tools/cygprofile" ] 474 deps += [ "//tools/cygprofile" ]
468 } 475 }
469 476
470 public_configs = extra_chrome_shared_library_configs 477 public_configs = extra_chrome_shared_library_configs
471 } 478 }
479 } else {
480 group("monochrome_secondary_abi_lib") {
481 public_deps = [
482 ":monochrome($android_secondary_abi_toolchain)",
483 ]
484 }
472 } 485 }
473 486
474 # GYP: //chrome/android/chrome_apk.gyp:libchrome_sync_shell 487 # GYP: //chrome/android/chrome_apk.gyp:libchrome_sync_shell
475 shared_library("chrome_sync_shell") { 488 shared_library("chrome_sync_shell") {
476 testonly = true 489 testonly = true
477 deps = [ 490 deps = [
478 "//build/config/sanitizers:deps", 491 "//build/config/sanitizers:deps",
479 "//chrome:chrome_android_core", 492 "//chrome:chrome_android_core",
480 "//sync", 493 "//sync",
481 "//sync:test_support_sync_fake_server_android", 494 "//sync:test_support_sync_fake_server_android",
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 apk_name = "ChromeSyncShellTest" 615 apk_name = "ChromeSyncShellTest"
603 apk_under_test = ":chrome_sync_shell_apk" 616 apk_under_test = ":chrome_sync_shell_apk"
604 android_manifest = chrome_sync_shell_test_apk_manifest 617 android_manifest = chrome_sync_shell_test_apk_manifest
605 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 618 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
606 deps = [ 619 deps = [
607 ":chrome_sync_shell_test_apk_java", 620 ":chrome_sync_shell_test_apk_java",
608 ] 621 ]
609 proguard_enabled = !is_java_debug 622 proguard_enabled = !is_java_debug
610 } 623 }
611 } 624 }
OLDNEW
« no previous file with comments | « build/config/android/config.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698