Reland #2 "Android: Bump default target_sdk_version 24 -> SDK used to compile"

This reverts commit 0763bc96.

Reason for reland: No longer removing target_sdk_version from webapk shell

Original change's description:
> Revert "Reland "Android: Bump default target_sdk_version 24 -> SDK used to compile""
>
> This reverts commit e0f5a1c0.
>
> Reason for revert: Breaking downstream builder:
> https://logs.chromium.org/logs/chrome/buildbucket/cr-buildbucket.appspot.com/8875332406729172240/+/steps/compile/0/logs/raw_io.output_failure_summary_/0
>
> Original change's description:
> > Reland "Android: Bump default target_sdk_version 24 -> SDK used to compile"
> >
> > This reverts commit fb07fcff.
> >
> > Reason for reland: Not changing target_sdk_version for angle tests
> >
> > Original change's description:
> > > Revert "Android: Bump default target_sdk_version 24 -> SDK used to compile"
> > >
> > > This reverts commit b7fb15b1.
> > >
> > > Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=1099849
> > >
> > > Original change's description:
> > > > Android: Bump default target_sdk_version 24 -> SDK used to compile
> > > >
> > > > Why do this?
> > > > * It's best practice to target the latest sdk, so this makes for a
> > > >   better default.
> > > > * Many targets were neglecting to ever update this value
> >
> > TBR=boliu@chromium.org,torne@chromium.org,agrieve@chromium.org,behdadb@chromium.org
> >
> > Bug: 1099849
> > Change-Id: I95f36a2b88d2e7ad1d90222f25192c9a915550ab
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2280981
> > Reviewed-by: Bo <boliu@chromium.org>
> > Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#786275}
>
> TBR=boliu@chromium.org,agrieve@chromium.org,behdadb@chromium.org
>
> Change-Id: If60966b54d37bfa2c5326bcad0f36819f1c47023
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1099849
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288092
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#786357}

TBR=boliu@chromium.org,agrieve@chromium.org,behdadb@chromium.org

Bug: 1103295
Change-Id: Ia7cdeb9dc309d4bea7e0863b709b29ebc49ee6e0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2288097
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786425}

android_webview/system_webview_apk_tmpl.gni

@@ -66,7 +66,6 @@ template("system_webview_apk_or_module_tmpl") {
       }
     }
 
-    target_sdk_version = android_sdk_version
     product_config_java_packages = [ webview_product_config_java_package ]
 
     if (webview_includes_weblayer) {

android_webview/test/BUILD.gn

@@ -43,6 +43,8 @@ python_library("system_webview_wpt") {
 }
 
 android_apk("webview_instrumentation_apk") {
+  # TODO(crbug.com/1099536): Fix tests that break when this is increased.
+  target_sdk_version = 24
   deps = [
     ":webview_instrumentation_apk_assets",
     ":webview_instrumentation_apk_resources",
@@ -157,6 +159,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
   apk_under_test = ":webview_instrumentation_apk"
   android_manifest = "../javatests/AndroidManifest.xml"
   min_sdk_version = 21
+
   deps = [
     ":webview_instrumentation_test_utils_java",
     "//android_webview:android_webview_java",

android_webview/tools/system_webview_shell/BUILD.gn

@@ -48,7 +48,6 @@ android_apk("system_webview_shell_apk") {
   ]
   android_manifest = system_webview_shell_android_manifest
   android_manifest_dep = ":system_webview_shell_manifest"
-  target_sdk_version = 29
   deps = [
     ":system_webview_shell_apk_resources",
     "//base:base_java",

base/android/jni_generator/BUILD.gn

@@ -64,7 +64,6 @@ shared_library("jni_sample_lib") {
 android_apk("sample_jni_apk") {
   apk_name = "SampleJni"
   android_manifest = "AndroidManifest.xml"
-  target_sdk_version = 24
   deps = [
     ":jni_sample_java",
     "//base:base_java",

build/config/android/rules.gni

@@ -1374,7 +1374,7 @@ if (enable_java_templates) {
       }
       arsc_output = _resource_arsc_output
       min_sdk_version = default_min_sdk_version
-      target_sdk_version = 23
+      target_sdk_version = android_sdk_version
     }
 
     _jni_srcjar_target = "${target_name}__final_jni"
@@ -2108,7 +2108,7 @@ if (enable_java_templates) {
   #   min_sdk_version: The minimum Android SDK version this target supports.
   #     Optional, default $default_min_sdk_version.
   #   target_sdk_version: The target Android SDK version for this target.
-  #     Optional, default 23.
+  #     Optional, default to android_sdk_version.
   #   max_sdk_version: The maximum Android SDK version this target supports.
   #     Optional, default not set.
   #   require_native_mocks: Enforce that any native calls using
@@ -2142,7 +2142,7 @@ if (enable_java_templates) {
     _build_config_target = "$target_name$build_config_target_suffix"
 
     _min_sdk_version = default_min_sdk_version
-    _target_sdk_version = 23
+    _target_sdk_version = android_sdk_version
     if (defined(invoker.min_sdk_version)) {
       _min_sdk_version = invoker.min_sdk_version
     }
@@ -3905,6 +3905,12 @@ if (enable_java_templates) {
       create_apk_script = false
       enable_native_mocks = true
 
+      # TODO(crbug.com/1099849): Figure out why angle tests fail to launch
+      #     with newer target_sdk_version.
+      if (!defined(invoker.target_sdk_version) && _use_native_activity) {
+        target_sdk_version = 24
+      }
+
       assert(!defined(invoker.proguard_enabled) || !invoker.proguard_enabled ||
              invoker.proguard_configs != [])
 

chrome/android/chrome_public_apk_tmpl.gni

@@ -148,7 +148,6 @@ template("chrome_public_common_apk_or_module_tmpl") {
     } else {
       min_sdk_version = 21
     }
-    target_sdk_version = android_sdk_version
 
     resource_exclusion_regex = common_resource_exclusion_regex
     resource_exclusion_exceptions = common_resource_exclusion_exceptions

chrome/android/modules/chrome_feature_module_tmpl.gni

@@ -95,7 +95,6 @@ template("chrome_feature_module") {
                              "version_name",
                            ])
     android_manifest = _module_desc.android_manifest
-    target_sdk_version = android_sdk_version
     deps = [ ":${target_name}__module_desc_java" ]
     if (defined(_module_desc.pak_deps)) {
       deps += [ ":${target_name}__pak_assets" ]

chrome/android/trichrome.gni

@@ -108,7 +108,6 @@ template("trichrome_library_apk_tmpl") {
     }
 
     min_sdk_version = 29
-    target_sdk_version = android_sdk_version
 
     if (trichrome_synchronized_proguard) {
       product_version_resources_dep =

chrome/android/webapk/shell_apk/BUILD.gn

@@ -242,10 +242,8 @@ template("webapk_tmpl") {
 
     android_manifest = _manifest_output
     android_manifest_dep = ":$_manifest_target_name"
-    min_sdk_version = 21
     target_sdk_version = 29
     never_incremental = true
-    enable_multidex = false
 
     # Force 32 bit mode on 64 bit devices.
     native_lib_placeholders = [ "libfoo.so" ]

chrome/test/android/chrome_public_test_support/BUILD.gn

@@ -20,5 +20,4 @@ android_apk("chrome_public_test_support_apk") {
 
   apk_name = "ChromePublicTestSupport"
   android_manifest = "AndroidManifest.xml"
-  target_sdk_version = 22
 }

content/shell/android/BUILD.gn

@@ -233,6 +233,9 @@ content_shell_apk_tmpl("content_shell_test_apk") {
   if (enable_chrome_android_internal) {
     data_deps += [ "//clank/build/bot/filters:content_shell_test_apk_filters" ]
   }
+
+  # TODO(crbug.com/1099536): Fix tests that break when this is increased.
+  target_sdk_version = 24
 }
 
 android_library("content_shell_test_java") {

mojo/public/java/system/BUILD.gn

@@ -169,6 +169,4 @@ instrumentation_test_apk("mojo_test_apk") {
   shared_libraries = [ ":mojo_java_unittests" ]
   apk_name = "MojoTest"
   android_manifest = "javatests/AndroidManifest.xml"
-  target_sdk_version = 21
-  enable_multidex = false
 }

remoting/android/BUILD.gn

@@ -165,7 +165,6 @@ remoting_localize("remoting_test_apk_manifest") {
 instrumentation_test_apk("remoting_test_apk") {
   android_manifest = "$root_gen_dir/remoting/android_test/AndroidManifest.xml"
   android_manifest_dep = ":remoting_test_apk_manifest"
-  target_sdk_version = 23
   apk_name = "ChromotingTest"
   apk_under_test = ":remoting_apk"
   sources = [