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

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

Issue 2354803002: Create Monochrome-specific repack() targets (Closed)
Patch Set: Revert android_webview/BUILD.gn Created 4 years, 3 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
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/util/process_version.gni") 7 import("//build/util/process_version.gni")
8 import("//build_overrides/v8.gni") 8 import("//build_overrides/v8.gni")
9 import("//chrome/android/chrome_public_apk_tmpl.gni") 9 import("//chrome/android/chrome_public_apk_tmpl.gni")
10 import("//chrome/chrome_paks.gni")
10 import("//chrome/common/features.gni") 11 import("//chrome/common/features.gni")
11 import("//chrome/process_version_rc_template.gni") # For branding_file_path. 12 import("//chrome/process_version_rc_template.gni") # For branding_file_path.
12 import("//testing/test.gni") 13 import("//testing/test.gni")
13 import("//third_party/icu/config.gni") 14 import("//third_party/icu/config.gni")
14 import("//third_party/protobuf/proto_library.gni") 15 import("//third_party/protobuf/proto_library.gni")
16 import("//tools/resources/generate_resource_whitelist.gni")
15 import("channel.gni") 17 import("channel.gni")
16 import("java_sources.gni") 18 import("java_sources.gni")
17 19
18 manifest_package = "org.chromium.chrome" 20 manifest_package = "org.chromium.chrome"
19 21
20 chrome_public_jinja_variables = default_chrome_public_jinja_variables + 22 chrome_public_jinja_variables = default_chrome_public_jinja_variables +
21 [ "manifest_package=$manifest_package" ] 23 [ "manifest_package=$manifest_package" ]
22 chrome_public_android_manifest = 24 chrome_public_android_manifest =
23 "$target_gen_dir/chrome_public_apk/AndroidManifest.xml" 25 "$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
24 chrome_sync_shell_android_manifest = 26 chrome_sync_shell_android_manifest =
25 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml" 27 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
26 28
27 chrome_sync_shell_jinja_variables = 29 chrome_sync_shell_jinja_variables =
28 default_chrome_public_jinja_variables + 30 default_chrome_public_jinja_variables +
29 [ "manifest_package=org.chromium.chrome.sync_shell" ] 31 [ "manifest_package=org.chromium.chrome.sync_shell" ]
30 32
33 if (enable_resource_whitelist_generation) {
34 monochrome_resource_whitelist =
35 "$target_gen_dir/monochrome_resource_whitelist.txt"
36 }
37
31 jinja_template("chrome_public_android_manifest") { 38 jinja_template("chrome_public_android_manifest") {
32 input = "java/AndroidManifest.xml" 39 input = "java/AndroidManifest.xml"
33 output = chrome_public_android_manifest 40 output = chrome_public_android_manifest
34 variables = chrome_public_jinja_variables 41 variables = chrome_public_jinja_variables
35 variables += [ 42 variables += [
36 "min_sdk_version=16", 43 "min_sdk_version=16",
37 "target_sdk_version=23", 44 "target_sdk_version=23",
38 ] 45 ]
39 } 46 }
40 47
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 # Overrides icon / name defined in chrome_java_resources. 486 # Overrides icon / name defined in chrome_java_resources.
480 android_resources("chrome_public_apk_resources") { 487 android_resources("chrome_public_apk_resources") {
481 resource_dirs = [ "java/res_chromium" ] 488 resource_dirs = [ "java/res_chromium" ]
482 489
483 # Dep needed to ensure override works properly. 490 # Dep needed to ensure override works properly.
484 deps = [ 491 deps = [
485 ":chrome_java_resources", 492 ":chrome_java_resources",
486 ] 493 ]
487 } 494 }
488 495
489 android_assets("chrome_public_apk_assets") { 496 # TODO(agrieve): Delete once downstream no longer references this target.
497 java_group("chrome_public_apk_assets") {
498 deps = [
499 ":chrome_public_non_pak_assets",
500 ":chrome_public_pak_assets",
501 ]
502 }
503
504 java_group("chrome_public_non_pak_assets") {
505 deps = [
506 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
507 "//third_party/icu:icu_assets",
508 "//v8:v8_external_startup_data_assets",
509 ]
510 }
511
512 android_assets("chrome_public_pak_assets") {
490 sources = [ 513 sources = [
491 "$root_out_dir/chrome_100_percent.pak", 514 "$root_out_dir/chrome_100_percent.pak",
492 "$root_out_dir/resources.pak", 515 "$root_out_dir/resources.pak",
493 ] 516 ]
494 disable_compression = true 517 disable_compression = true
495 518
496 deps = [ 519 deps = [
497 "//chrome:packed_extra_resources",
498 "//chrome:packed_resources", 520 "//chrome:packed_resources",
499 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets", 521 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
500 "//third_party/icu:icu_assets", 522 "//third_party/icu:icu_assets",
501 "//v8:v8_external_startup_data_assets", 523 "//v8:v8_external_startup_data_assets",
502 ] 524 ]
503 } 525 }
504 526
505 jinja_template_resources("chrome_public_apk_template_resources") { 527 jinja_template_resources("chrome_public_apk_template_resources") {
506 resources = [ 528 resources = [
507 "java/res_template/xml/chromebackupscheme.xml", 529 "java/res_template/xml/chromebackupscheme.xml",
(...skipping 24 matching lines...) Expand all
532 "//chrome:chrome_android_core", 554 "//chrome:chrome_android_core",
533 ] 555 ]
534 556
535 if (is_android && use_order_profiling) { 557 if (is_android && use_order_profiling) {
536 deps += [ "//tools/cygprofile" ] 558 deps += [ "//tools/cygprofile" ]
537 } 559 }
538 560
539 public_configs = extra_chrome_shared_library_configs 561 public_configs = extra_chrome_shared_library_configs
540 } 562 }
541 563
564 if (enable_resource_whitelist_generation) {
565 generate_resource_whitelist("monochrome_resource_whitelist") {
566 deps = [
567 ":monochrome",
568 ]
569 input = "$root_out_dir/libmonochrome$shlib_extension.whitelist"
570 output = monochrome_resource_whitelist
571 }
572 }
573
574 chrome_paks("monochrome_paks") {
575 output_dir = "$target_gen_dir/$target_name"
576
577 additional_extra_paks = [ "$root_gen_dir/android_webview/aw_resources.pak" ]
578 deps = [
579 "//android_webview:generate_aw_resources",
580 ]
581
582 if (enable_resource_whitelist_generation) {
583 repack_whitelist = monochrome_resource_whitelist
584 deps += [ ":monochrome_resource_whitelist" ]
585 }
586 }
587
588 java_group("monochrome_assets") {
589 deps = [
590 ":monochrome_pak_assets",
591 "//android_webview:monochrome_webview_assets",
592 ]
593 }
594
595 android_assets("monochrome_pak_assets") {
596 sources = [
597 "$target_gen_dir/monochrome_paks/chrome_100_percent.pak",
598 "$target_gen_dir/monochrome_paks/resources.pak",
599 ]
600 deps = [
601 ":monochrome_paks",
602 ]
603 disable_compression = true
604 }
605
542 # 606 #
543 # Only 32-bit //chrome/android/monochrome is needed, beside 607 # Only 32-bit //chrome/android/monochrome is needed, beside
544 # being built with 32-bit default toolchain, it is also built 608 # being built with 32-bit default toolchain, it is also built
545 # with secondary 32-bit toolchain in 64-bit platform because we 609 # with secondary 32-bit toolchain in 64-bit platform because we
546 # need 64-bit //android_webview/monochrome and 32-bit this target 610 # need 64-bit //android_webview/monochrome and 32-bit this target
547 # for 64-bit APK. 611 # for 64-bit APK.
548 if (!android_64bit_target_cpu || 612 if (!android_64bit_target_cpu ||
549 current_toolchain == android_secondary_abi_toolchain) { 613 current_toolchain == android_secondary_abi_toolchain) {
550 shared_library("monochrome") { 614 shared_library("monochrome") {
551 sources = [ 615 sources = [
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 instrumentation_test_apk("chrome_sync_shell_test_apk") { 758 instrumentation_test_apk("chrome_sync_shell_test_apk") {
695 apk_name = "ChromeSyncShellTest" 759 apk_name = "ChromeSyncShellTest"
696 apk_under_test = ":chrome_sync_shell_apk" 760 apk_under_test = ":chrome_sync_shell_apk"
697 android_manifest = chrome_sync_shell_test_apk_manifest 761 android_manifest = chrome_sync_shell_test_apk_manifest
698 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest" 762 android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
699 deps = [ 763 deps = [
700 ":chrome_sync_shell_test_apk_java", 764 ":chrome_sync_shell_test_apk_java",
701 ] 765 ]
702 proguard_enabled = !is_java_debug 766 proguard_enabled = !is_java_debug
703 } 767 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698