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

Unified Diff: chrome/android/BUILD.gn

Issue 2483213003: Add chrome_modern_public_apk target (Closed)
Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index fb88ef75546d1fa1740e689360a244007e8351dd..fe835cb3ee254d756dc9c96ed448b0579c251c08 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -24,6 +24,8 @@ chrome_public_jinja_variables = default_chrome_public_jinja_variables +
[ "manifest_package=$manifest_package" ]
chrome_public_android_manifest =
"$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
+chrome_modern_public_android_manifest =
+ "$target_gen_dir/chrome_modern_public_apk/AndroidManifest.xml"
chrome_sync_shell_android_manifest =
"$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
@@ -46,6 +48,16 @@ jinja_template("chrome_public_android_manifest") {
]
}
+jinja_template("chrome_modern_public_android_manifest") {
+ input = "java/AndroidManifest.xml"
+ output = chrome_modern_public_android_manifest
+ variables = chrome_public_jinja_variables
+ variables += [
+ "min_sdk_version=21",
+ "target_sdk_version=23",
+ ]
+}
+
java_cpp_template("chrome_webapk_signature_srcjar") {
sources = [
"java/src/org/chromium/chrome/browser/webapps/ChromeWebApkHostSignature.template",
@@ -647,6 +659,9 @@ shared_library("chrome_sync_shell") {
template("chrome_public_apk_tmpl_shared") {
chrome_public_apk_tmpl(target_name) {
forward_variables_from(invoker, "*")
+ if (!defined(deps)) {
+ deps = []
+ }
native_lib_version_rule = "//build/util:chrome_version_json"
deps += [
@@ -664,8 +679,16 @@ chrome_public_apk_tmpl_shared("chrome_public_apk") {
android_manifest_dep = ":chrome_public_android_manifest"
apk_name = "ChromePublic"
shared_libraries = [ ":chrome" ]
+}
+
+chrome_public_apk_tmpl_shared("chrome_modern_public_apk") {
+ android_manifest = chrome_modern_public_android_manifest
+ android_manifest_dep = ":chrome_modern_public_android_manifest"
+ apk_name = "ChromeModernPublic"
+ shared_libraries = [ ":chrome" ]
- deps = []
+ # Always enable load_library_from_apk.
+ load_library_from_apk = chromium_linker_supported
}
chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698