Skip to content

Commit

Permalink
Fixing up min_sdk_version for a few targets
Browse files Browse the repository at this point in the history
Bug: 944073
Change-Id: Ib2225f1e075bcf4b58e4046268a49a896e795f34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1532891
Commit-Queue: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#643002}
  • Loading branch information
Sam Maier authored and Commit Bot committed Mar 21, 2019
1 parent a4a3803 commit 76bc8db
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 0 additions & 2 deletions chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1591,11 +1591,9 @@ template("chrome_public_apk_or_module_tmpl") {
deps = _chrome_public_shared_deps

if (_is_modern) {
min_sdk_version = 21
android_manifest = chrome_modern_public_android_manifest
android_manifest_dep = ":chrome_modern_public_android_manifest"
} else {
min_sdk_version = 19
android_manifest = chrome_public_android_manifest
android_manifest_dep = ":chrome_public_android_manifest"
}
Expand Down
12 changes: 10 additions & 2 deletions chrome/android/chrome_public_apk_tmpl.gni
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,16 @@ template("chrome_public_common_apk_or_module_tmpl") {
target(_target_type, target_name) {
forward_variables_from(invoker, "*")

if (_is_trichrome) {
min_sdk_version = 28
} else if (_is_monochrome) {
min_sdk_version = 24
} else if (_is_modern) {
min_sdk_version = 21
} else {
min_sdk_version = 19
}

resource_blacklist_regex = "[/-]xxxhdpi[/-]"

# Exception rationale in https://crbug.com/691733.
Expand Down Expand Up @@ -342,7 +352,6 @@ template("monochrome_public_common_apk_or_module_tmpl") {
}
alternative_android_sdk_dep = webview_framework_dep
app_as_shared_lib = true
min_sdk_version = 24
_pak_prefix = "monochrome"
}
if (is_trichrome) {
Expand All @@ -359,7 +368,6 @@ template("monochrome_public_common_apk_or_module_tmpl") {
if (android_64bit_target_cpu && build_apk_secondary_abi) {
secondary_native_lib_placeholders = [ "libdummy.so" ]
}
min_sdk_version = 28
_pak_prefix = "trichrome_chrome"
}

Expand Down
1 change: 1 addition & 0 deletions chrome/android/trichrome.gni
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ template("trichrome_library_apk_tmpl") {
uncompress_dex = use_uncompressed_dex
version_name = chrome_version_name
version_code = trichrome_version_code
min_sdk_version = 28

# TODO(torne): using system_webview_resources just to get a temporary icon
deps = [
Expand Down

0 comments on commit 76bc8db

Please sign in to comment.