Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

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

Issue 29684695: Issue 6287 - Create codename Orca v.0 to launch internally to the team (Closed)
Patch Set: Fixed comments Created Feb. 2, 2018, 12:50 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/android/version.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("//base/android/jni_generator/jni_exception_list.gni") 5 import("//base/android/jni_generator/jni_exception_list.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/process_version.gni") 8 import("//build/util/process_version.gni")
9 import("//chrome/android/chrome_public_apk_tmpl.gni") 9 import("//chrome/android/chrome_public_apk_tmpl.gni")
10 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni") 10 import("//chrome/android/monochrome_android_manifest_jinja_variables.gni")
11 import("//chrome/chrome_paks.gni") 11 import("//chrome/chrome_paks.gni")
12 import("//chrome/common/features.gni") 12 import("//chrome/common/features.gni")
13 import("//chrome/process_version_rc_template.gni") # For branding_file_path. 13 import("//chrome/process_version_rc_template.gni") # For branding_file_path.
14 import("//device/vr/features/features.gni") 14 import("//device/vr/features/features.gni")
15 import("//testing/test.gni") 15 import("//testing/test.gni")
16 import("//third_party/icu/config.gni") 16 import("//third_party/icu/config.gni")
17 import("//third_party/protobuf/proto_library.gni") 17 import("//third_party/protobuf/proto_library.gni")
18 import("//tools/resources/generate_resource_whitelist.gni") 18 import("//tools/resources/generate_resource_whitelist.gni")
19 import("channel.gni") 19 import("channel.gni")
20 import("java_sources.gni") 20 import("java_sources.gni")
21 21
22 manifest_package = "org.chromium.chrome" 22 # Change package name. See https://issues.adblockplus.org/ticket/6287
23 manifest_package = "org.adblockplus.orca"
23 24
24 chrome_public_jinja_variables = default_chrome_public_jinja_variables + 25 chrome_public_jinja_variables = default_chrome_public_jinja_variables +
25 [ "manifest_package=$manifest_package" ] 26 [ "manifest_package=$manifest_package" ]
26 chrome_public_android_manifest = 27 chrome_public_android_manifest =
27 "$target_gen_dir/chrome_public_apk/AndroidManifest.xml" 28 "$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
28 chrome_modern_public_android_manifest = 29 chrome_modern_public_android_manifest =
29 "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml" 30 "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml"
30 chrome_sync_shell_android_manifest = 31 chrome_sync_shell_android_manifest =
31 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml" 32 "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
32 monochrome_public_android_manifest = 33 monochrome_public_android_manifest =
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 variables = chrome_sync_shell_jinja_variables 82 variables = chrome_sync_shell_jinja_variables
82 variables += [ 83 variables += [
83 "min_sdk_version=16", 84 "min_sdk_version=16",
84 "target_sdk_version=22", 85 "target_sdk_version=22",
85 ] 86 ]
86 } 87 }
87 88
88 android_resources("chrome_java_resources") { 89 android_resources("chrome_java_resources") {
89 resource_dirs = [ 90 resource_dirs = [
90 "java/res", 91 "java/res",
91 "//chrome/android/java/res_chromium", 92 # Change res directory for rebranding. See https://issues.adblockplus.org/ti cket/6287
93 "//chrome/android/java/res_orca",
92 ] 94 ]
93 deps = [ 95 deps = [
94 ":chrome_strings_grd", 96 ":chrome_strings_grd",
95 "//chrome/app:java_strings_grd", 97 "//chrome/app:java_strings_grd",
96 "//components/autofill/android:autofill_java_resources", 98 "//components/autofill/android:autofill_java_resources",
97 "//components/policy:app_restrictions_resources", 99 "//components/policy:app_restrictions_resources",
98 "//components/strings:components_locale_settings_grd", 100 "//components/strings:components_locale_settings_grd",
99 "//components/strings:components_strings_grd", 101 "//components/strings:components_strings_grd",
100 "//content/public/android:content_java_resources", 102 "//content/public/android:content_java_resources",
101 "//third_party/android_data_chart:android_data_chart_java_resources", 103 "//third_party/android_data_chart:android_data_chart_java_resources",
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 "//chrome/android/shared_preference_files/test/", 643 "//chrome/android/shared_preference_files/test/",
642 "//chrome/test/data/android/", 644 "//chrome/test/data/android/",
643 "//third_party/gvr-android-sdk/test-apks/", 645 "//third_party/gvr-android-sdk/test-apks/",
644 "//third_party/WebKit/LayoutTests/resources/testharness.js", 646 "//third_party/WebKit/LayoutTests/resources/testharness.js",
645 ] 647 ]
646 } 648 }
647 } 649 }
648 650
649 # Overrides icon / name defined in chrome_java_resources. 651 # Overrides icon / name defined in chrome_java_resources.
650 android_resources("chrome_public_apk_resources") { 652 android_resources("chrome_public_apk_resources") {
651 resource_dirs = [ "java/res_chromium" ] 653 # Change res directory for rebranding. See https://issues.adblockplus.org/tick et/6287
654 resource_dirs = [ "java/res_orca" ]
652 655
653 # Dep needed to ensure override works properly. 656 # Dep needed to ensure override works properly.
654 deps = [ 657 deps = [
655 ":chrome_java_resources", 658 ":chrome_java_resources",
656 ] 659 ]
657 } 660 }
658 661
659 java_group("chrome_public_non_pak_assets") { 662 java_group("chrome_public_non_pak_assets") {
660 deps = [ 663 deps = [
661 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets", 664 "//chrome/android/webapk/libs/runtime_library:runtime_library_assets",
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 ":chrome_public_non_pak_assets", 968 ":chrome_public_non_pak_assets",
966 ":chrome_public_pak_assets", 969 ":chrome_public_pak_assets",
967 "//base:base_java", 970 "//base:base_java",
968 ] 971 ]
969 } 972 }
970 } 973 }
971 974
972 chrome_public_apk_tmpl_shared("chrome_public_apk") { 975 chrome_public_apk_tmpl_shared("chrome_public_apk") {
973 android_manifest = chrome_public_android_manifest 976 android_manifest = chrome_public_android_manifest
974 android_manifest_dep = ":chrome_public_android_manifest" 977 android_manifest_dep = ":chrome_public_android_manifest"
975 apk_name = "ChromePublic" 978 # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/62 87
979 apk_name = "OrcaPublic"
976 shared_libraries = [ ":chrome" ] 980 shared_libraries = [ ":chrome" ]
977 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ] 981 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ]
978 } 982 }
979 983
980 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") { 984 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") {
981 android_manifest = chrome_modern_public_android_manifest 985 android_manifest = chrome_modern_public_android_manifest
982 android_manifest_dep = ":chrome_modern_public_android_manifest" 986 android_manifest_dep = ":chrome_modern_public_android_manifest"
983 apk_name = "ChromeModernPublic" 987 # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/62 87
988 apk_name = "OrcaModernPublic"
984 shared_libraries = [ ":chrome" ] 989 shared_libraries = [ ":chrome" ]
985 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ] 990 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ]
986 991
987 if (!is_java_debug) { 992 if (!is_java_debug) {
988 png_to_webp = true 993 png_to_webp = true
989 } 994 }
990 995
991 # Always enable load_library_from_apk. 996 # Always enable load_library_from_apk.
992 load_library_from_apk = chromium_linker_supported 997 load_library_from_apk = chromium_linker_supported
993 } 998 }
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1099 } 1104 }
1100 1105
1101 # The test APK contains code from both the APK under test and the 1106 # The test APK contains code from both the APK under test and the
1102 # test APK when proguard is enabled. That causes this APK to exceed 1107 # test APK when proguard is enabled. That causes this APK to exceed
1103 # the dex limit. 1108 # the dex limit.
1104 enable_multidex = proguard_enabled 1109 enable_multidex = proguard_enabled
1105 } 1110 }
1106 1111
1107 if (enable_vr) { 1112 if (enable_vr) {
1108 instrumentation_test_apk("chrome_public_test_vr_apk") { 1113 instrumentation_test_apk("chrome_public_test_vr_apk") {
1109 apk_name = "ChromePublicTestVr" 1114 # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/ 6287
1115 apk_name = "OrcaPublicTestVr"
1110 apk_under_test = ":chrome_public_apk" 1116 apk_under_test = ":chrome_public_apk"
1111 android_manifest = chrome_public_test_vr_apk_manifest 1117 android_manifest = chrome_public_test_vr_apk_manifest
1112 android_manifest_dep = ":chrome_public_test_vr_apk_manifest" 1118 android_manifest_dep = ":chrome_public_test_vr_apk_manifest"
1113 1119
1114 deps = [ 1120 deps = [
1115 ":chrome_test_vr_java", 1121 ":chrome_test_vr_java",
1116 ] 1122 ]
1117 additional_apks = [ "//net/android:net_test_support_apk" ] 1123 additional_apks = [ "//net/android:net_test_support_apk" ]
1118 proguard_enabled = !is_java_debug 1124 proguard_enabled = !is_java_debug
1119 if (proguard_enabled && !enable_proguard_obfuscation && 1125 if (proguard_enabled && !enable_proguard_obfuscation &&
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
1177 "//ui/android:ui_java", 1183 "//ui/android:ui_java",
1178 ] 1184 ]
1179 proguard_enabled = !is_java_debug 1185 proguard_enabled = !is_java_debug
1180 if (proguard_enabled && !enable_proguard_obfuscation && 1186 if (proguard_enabled && !enable_proguard_obfuscation &&
1181 enable_proguard_obfuscation_for_tests) { 1187 enable_proguard_obfuscation_for_tests) {
1182 proguard_configs = [ "//base/android/proguard/enable_obfuscation.flags" ] 1188 proguard_configs = [ "//base/android/proguard/enable_obfuscation.flags" ]
1183 proguard_config_exclusions = 1189 proguard_config_exclusions =
1184 [ "//base/android/proguard/disable_chromium_obfuscation.flags" ] 1190 [ "//base/android/proguard/disable_chromium_obfuscation.flags" ]
1185 } 1191 }
1186 } 1192 }
OLDNEW
« no previous file with comments | « build/config/android/version.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld