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

Delta Between Two Patch Sets: chrome/android/BUILD.gn

Issue 29684695: Issue 6287 - Create codename Orca v.0 to launch internally to the team (Closed)
Left Patch Set: Added basic versioning Created Jan. 31, 2018, 4:54 p.m.
Right 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:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « build/config/android/version.gni ('k') | chrome/android/chrome_public_apk_tmpl.gni » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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")
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 ":chrome_public_non_pak_assets", 968 ":chrome_public_non_pak_assets",
969 ":chrome_public_pak_assets", 969 ":chrome_public_pak_assets",
970 "//base:base_java", 970 "//base:base_java",
971 ] 971 ]
972 } 972 }
973 } 973 }
974 974
975 chrome_public_apk_tmpl_shared("chrome_public_apk") { 975 chrome_public_apk_tmpl_shared("chrome_public_apk") {
976 android_manifest = chrome_public_android_manifest 976 android_manifest = chrome_public_android_manifest
977 android_manifest_dep = ":chrome_public_android_manifest" 977 android_manifest_dep = ":chrome_public_android_manifest"
978 # Change res directory for rebranding. See https://issues.adblockplus.org/tick et/6287 978 # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/62 87
diegocarloslima 2018/01/31 17:48:44 The comment here and the following ones should be
jens 2018/02/01 08:54:51 Acknowledged.
979 apk_name = "OrcaPublic" 979 apk_name = "OrcaPublic"
980 shared_libraries = [ ":chrome" ] 980 shared_libraries = [ ":chrome" ]
981 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ] 981 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ]
982 } 982 }
983 983
984 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") { 984 chrome_public_apk_tmpl_shared("chrome_modern_public_apk") {
985 android_manifest = chrome_modern_public_android_manifest 985 android_manifest = chrome_modern_public_android_manifest
986 android_manifest_dep = ":chrome_modern_public_android_manifest" 986 android_manifest_dep = ":chrome_modern_public_android_manifest"
987 # Change res directory for rebranding. See https://issues.adblockplus.org/tick et/6287 987 # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/62 87
988 apk_name = "OrcaModernPublic" 988 apk_name = "OrcaModernPublic"
989 shared_libraries = [ ":chrome" ] 989 shared_libraries = [ ":chrome" ]
990 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ] 990 shared_libraries += [ "//third_party/libadblockplus_android:aar_java_native" ]
991 991
992 if (!is_java_debug) { 992 if (!is_java_debug) {
993 png_to_webp = true 993 png_to_webp = true
994 } 994 }
995 995
996 # Always enable load_library_from_apk. 996 # Always enable load_library_from_apk.
997 load_library_from_apk = chromium_linker_supported 997 load_library_from_apk = chromium_linker_supported
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 } 1104 }
1105 1105
1106 # 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
1107 # 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
1108 # the dex limit. 1108 # the dex limit.
1109 enable_multidex = proguard_enabled 1109 enable_multidex = proguard_enabled
1110 } 1110 }
1111 1111
1112 if (enable_vr) { 1112 if (enable_vr) {
1113 instrumentation_test_apk("chrome_public_test_vr_apk") { 1113 instrumentation_test_apk("chrome_public_test_vr_apk") {
1114 # Change res directory for rebranding. See https://issues.adblockplus.org/ti cket/6287 1114 # Change APK name for rebranding. See https://issues.adblockplus.org/ticket/ 6287
1115 apk_name = "OrcaPublicTestVr" 1115 apk_name = "OrcaPublicTestVr"
1116 apk_under_test = ":chrome_public_apk" 1116 apk_under_test = ":chrome_public_apk"
1117 android_manifest = chrome_public_test_vr_apk_manifest 1117 android_manifest = chrome_public_test_vr_apk_manifest
1118 android_manifest_dep = ":chrome_public_test_vr_apk_manifest" 1118 android_manifest_dep = ":chrome_public_test_vr_apk_manifest"
1119 1119
1120 deps = [ 1120 deps = [
1121 ":chrome_test_vr_java", 1121 ":chrome_test_vr_java",
1122 ] 1122 ]
1123 additional_apks = [ "//net/android:net_test_support_apk" ] 1123 additional_apks = [ "//net/android:net_test_support_apk" ]
1124 proguard_enabled = !is_java_debug 1124 proguard_enabled = !is_java_debug
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 "//ui/android:ui_java", 1183 "//ui/android:ui_java",
1184 ] 1184 ]
1185 proguard_enabled = !is_java_debug 1185 proguard_enabled = !is_java_debug
1186 if (proguard_enabled && !enable_proguard_obfuscation && 1186 if (proguard_enabled && !enable_proguard_obfuscation &&
1187 enable_proguard_obfuscation_for_tests) { 1187 enable_proguard_obfuscation_for_tests) {
1188 proguard_configs = [ "//base/android/proguard/enable_obfuscation.flags" ] 1188 proguard_configs = [ "//base/android/proguard/enable_obfuscation.flags" ]
1189 proguard_config_exclusions = 1189 proguard_config_exclusions =
1190 [ "//base/android/proguard/disable_chromium_obfuscation.flags" ] 1190 [ "//base/android/proguard/disable_chromium_obfuscation.flags" ]
1191 } 1191 }
1192 } 1192 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld