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

Side by Side Diff: chrome/android/chrome_public_apk_tmpl.gni

Issue 2404253003: Reland #2 of Fix monochrome not booting issue (Closed)
Patch Set: Change default back to loading locales from disk Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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/linker/config.gni") 5 import("//base/android/linker/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 import("//chrome/common/features.gni") 7 import("//chrome/common/features.gni")
8 import("//third_party/leakcanary/config.gni") 8 import("//third_party/leakcanary/config.gni")
9 import("channel.gni") 9 import("channel.gni")
10 10
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 if (android_64bit_target_cpu) { 85 if (android_64bit_target_cpu) {
86 shared_libraries = [ "//android_webview:monochrome" ] 86 shared_libraries = [ "//android_webview:monochrome" ]
87 } else { 87 } else {
88 shared_libraries = [ "//chrome/android:monochrome" ] 88 shared_libraries = [ "//chrome/android:monochrome" ]
89 } 89 }
90 if (android_64bit_target_cpu && build_apk_secondary_abi) { 90 if (android_64bit_target_cpu && build_apk_secondary_abi) {
91 secondary_abi_shared_libraries = 91 secondary_abi_shared_libraries =
92 [ "//chrome/android:monochrome_secondary_abi_lib" ] 92 [ "//chrome/android:monochrome_secondary_abi_lib" ]
93 } 93 }
94 94
95 alternative_locale_resource_dep = "//chrome/android:monochrome_locale_paks"
96
97 alternative_android_sdk_jar = webview_framework_jar 95 alternative_android_sdk_jar = webview_framework_jar
98 app_as_shared_lib = true 96 app_as_shared_lib = true
99 use_chromium_linker = false 97 use_chromium_linker = false
100 requires_sdk_api_level_23 = true 98 requires_sdk_api_level_23 = true
101 enable_relocation_packing = true 99 enable_relocation_packing = true
102 extensions_to_not_compress = ".lpak,.pak,.bin,.dat" 100 extensions_to_not_compress = ".lpak,.pak,.bin,.dat"
103 101
104 # Configrations to make android load shared library from APK. 102 # Configrations to make android load shared library from APK.
105 uncompress_shared_libraries = true 103 uncompress_shared_libraries = true
106 page_align_shared_libraries = true 104 page_align_shared_libraries = true
107 105
108 forward_variables_from(invoker, "*") 106 forward_variables_from(invoker, "*")
109 107
110 if (!defined(deps)) { 108 if (!defined(deps)) {
111 deps = [] 109 deps = []
112 } 110 }
113 deps += [ "//android_webview/glue" ] 111 deps += [ "//android_webview/glue" ]
114 112
115 if (!is_java_debug) { 113 if (!is_java_debug) {
116 if (!defined(proguard_configs)) { 114 if (!defined(proguard_configs)) {
117 proguard_configs = [] 115 proguard_configs = []
118 } 116 }
119 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ] 117 proguard_configs += [ "//android_webview/apk/java/proguard.flags" ]
120 } 118 }
121 } 119 }
122 } 120 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698