chromium/src
0
Fork 0
Code Activity

Android: Remove unused requires_sdk_api_level_23 GN variable.

Browse Source 
Change-Id: I23307974a3699c5c46cad7ccaabc83d4708ed22d
Reviewed-on: https://chromium-review.googlesource.com/1246041
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594432}
This commit is contained in:
Eric Stevenson
2018-09-26 19:35:30 +00:00
committed by Commit Bot
parent eb74ff2fcc
commit d5055e2d6f
2 changed files with 2 additions and 13 deletions
build/config/android
rules.gni
chrome/android
chrome_public_apk_tmpl.gni

14
build/config/android/rules.gni

@@ -1878,9 +1878,6 @@ if (enable_java_templates) {
# is true for non-test APKs. # is true for non-test APKs.
# firebase_app_id: The value for BuildConfig.FIREBASE_APP_ID (optional). # firebase_app_id: The value for BuildConfig.FIREBASE_APP_ID (optional).
# Identifier is sent with crash reports to enable Java stack deobfuscation. # Identifier is sent with crash reports to enable Java stack deobfuscation.
# requires_sdk_api_level_23: If defined and true, the apk is intended for
# installation only on Android M or later. In these releases the system
# linker does relocation unpacking, so we can enable it unconditionally.
# aapt_locale_whitelist: If set, all locales not in this list will be # aapt_locale_whitelist: If set, all locales not in this list will be
# stripped from resources.arsc. # stripped from resources.arsc.
# resource_blacklist_regex: Causes all drawable images matching the regex to # resource_blacklist_regex: Causes all drawable images matching the regex to
@@ -2005,15 +2002,10 @@ if (enable_java_templates) {
_load_library_from_apk = _load_library_from_apk =
defined(invoker.load_library_from_apk) && invoker.load_library_from_apk defined(invoker.load_library_from_apk) && invoker.load_library_from_apk
_requires_sdk_api_level_23 = defined(invoker.requires_sdk_api_level_23) &&
invoker.requires_sdk_api_level_23
assert(_use_chromium_linker || true) # Mark as used. assert(_use_chromium_linker || true) # Mark as used.
assert(_requires_sdk_api_level_23 || true) assert(!_load_library_from_apk || _use_chromium_linker,
assert(!_load_library_from_apk || _use_chromium_linker || "load_library_from_apk requires use_chromium_linker")
_requires_sdk_api_level_23,
"load_library_from_apk requires use_chromium_linker " +
"or requires_sdk_api_level_23")
# Make sure that uncompress_shared_libraries is set to true if # Make sure that uncompress_shared_libraries is set to true if
# load_library_from_apk is true. # load_library_from_apk is true.
@@ -2908,7 +2900,6 @@ if (enable_java_templates) {
"proguard_configs", "proguard_configs",
"proguard_enabled", "proguard_enabled",
"proguard_jar_path", "proguard_jar_path",
"requires_sdk_api_level_23",
"resource_blacklist_regex", "resource_blacklist_regex",
"resource_blacklist_exceptions", "resource_blacklist_exceptions",
"secondary_abi_loadable_modules", "secondary_abi_loadable_modules",
@@ -3004,7 +2995,6 @@ if (enable_java_templates) {
"proguard_configs", "proguard_configs",
"proguard_enabled", "proguard_enabled",
"proguard_jar_path", "proguard_jar_path",
"requires_sdk_api_level_23",
"resource_blacklist_regex", "resource_blacklist_regex",
"resource_blacklist_exceptions", "resource_blacklist_exceptions",
"secondary_abi_loadable_modules", "secondary_abi_loadable_modules",

1
chrome/android/chrome_public_apk_tmpl.gni

@@ -222,7 +222,6 @@ template("monochrome_public_common_apk_or_module_tmpl") {
alternative_android_sdk_dep = webview_framework_dep alternative_android_sdk_dep = webview_framework_dep
app_as_shared_lib = true app_as_shared_lib = true
use_chromium_linker = false use_chromium_linker = false
requires_sdk_api_level_23 = true
# Webview supports all locales (has no omitted ones). # Webview supports all locales (has no omitted ones).
aapt_locale_whitelist = locales aapt_locale_whitelist = locales