Android: Remove a few more remnants of pre-Android-Q SDK

* trichrome_shared_assets GN arg
* references to o_mr1 and p in config.gni

Bug: 1003532
Change-Id: Ib3c9df5638ed8b336457b9dc9a450ffc9b578879
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1916681
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Richard Coles <torne@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715411}

android_webview/system_webview_apk_tmpl.gni

@@ -51,7 +51,7 @@ template("system_webview_apk_tmpl") {
     _use_trichrome_library =
         defined(use_trichrome_library) && use_trichrome_library
 
-    if (!_use_trichrome_library || !trichrome_shared_assets) {
+    if (!_use_trichrome_library) {
       deps += [ "//android_webview:monochrome_webview_assets" ]
     }
 

build/config/android/config.gni

@@ -57,8 +57,7 @@ if (is_android || is_chromeos) {
   } else {
     import("//build/config/android/sdk.gni")
     declare_args() {
-      # Android SDK release. Currently, only "o_mr1" and "p" are publicly
-      # supported.
+      # Which Android SDK to use.
       android_sdk_release = default_android_sdk_release
     }
   }
@@ -72,19 +71,7 @@ if (is_android || is_chromeos) {
     assert(defined(default_android_ndk_major_version))
   }
 
-  if (android_sdk_release == "o_mr1") {
-    default_android_sdk_root = "//third_party/android_sdk/public"
-    default_android_sdk_version = 27
-    default_android_sdk_build_tools_version = "29.0.2"
-    default_android_sdk_tools_version_suffix = "-26.0.0-dev"
-    public_android_sdk = true
-  } else if (android_sdk_release == "p") {
-    default_android_sdk_root = "//third_party/android_sdk/public"
-    default_android_sdk_version = 28
-    default_android_sdk_build_tools_version = "29.0.2"
-    default_android_sdk_tools_version_suffix = "-26.0.0-dev"
-    public_android_sdk = true
-  } else if (android_sdk_release == "q") {
+  if (android_sdk_release == "q") {
     default_android_sdk_root = "//third_party/android_sdk/public"
     default_android_sdk_version = 29
     default_android_sdk_build_tools_version = "29.0.2"
@@ -214,10 +201,6 @@ if (is_android || is_chromeos) {
 
     # Enable the chrome build for devices without touchscreens.
     notouch_build = false
-
-    # Move Trichrome assets to the shared library APK. This will be removed
-    # once P builds are no longer supported. https://crbug.com/943637
-    trichrome_shared_assets = android_sdk_release == "q"
   }
 
   if (notouch_build && defined(extra_keymappings)) {

chrome/android/chrome_public_apk_tmpl.gni

@@ -392,10 +392,6 @@ template("monochrome_public_common_apk_or_module_tmpl") {
       _pak_prefix = "monochrome"
     }
     if (is_trichrome) {
-      if (!trichrome_shared_assets) {
-        _deps += [ "//android_webview:monochrome_webview_assets" ]
-      }
-
       # Include placeholder libraries to make Chrome multiarch in the same way
       # as Monochrome, even though Chrome only runs with one of the two
       # bitnesses. This allows the "32-bit" and "64-bit" versions of Chrome to

chrome/android/trichrome.gni

@@ -96,12 +96,9 @@ template("trichrome_library_apk_tmpl") {
     # TODO(torne): using icon_resources just to get a temporary icon
     deps = [
       "//android_webview/nonembedded:icon_resources",
+      "//third_party/icu:icu_assets",
     ]
 
-    if (trichrome_shared_assets) {
-      deps += [ "//third_party/icu:icu_assets" ]
-    }
-
     _native_lib_file =
         rebase_path("$root_gen_dir/CHROME_VERSION.json", root_out_dir)
     native_lib_version_arg = "@FileArg($_native_lib_file:full-quoted)"
@@ -115,11 +112,9 @@ template("trichrome_library_apk_tmpl") {
       if (defined(invoker.is_64_bit_browser) && invoker.is_64_bit_browser) {
         shared_libraries = [ "//chrome/android:libmonochrome_64" ]
         deps += [
+          "//chrome/android:chrome_public_v8_assets",
           "//third_party/crashpad/crashpad/handler:crashpad_handler_trampoline",
         ]
-        if (trichrome_shared_assets) {
-          deps += [ "//chrome/android:chrome_public_v8_assets" ]
-        }
         loadable_modules = [ "$root_out_dir/libcrashpad_handler_trampoline.so" ]
         if (build_apk_secondary_abi &&
             defined(invoker.include_32_bit_webview) &&
@@ -146,9 +141,7 @@ template("trichrome_library_apk_tmpl") {
           }
         }
 
-        if (trichrome_shared_assets) {
-          deps += [ "//android_webview:v8_snapshot_secondary_abi_assets" ]
-        }
+        deps += [ "//android_webview:v8_snapshot_secondary_abi_assets" ]
       }
     } else {
       if (defined(invoker.is_64_bit_browser) && invoker.is_64_bit_browser) {
@@ -156,11 +149,9 @@ template("trichrome_library_apk_tmpl") {
       } else {
         shared_libraries = [ "//chrome/android:libmonochrome" ]
         deps += [
+          "//chrome/android:chrome_public_v8_assets",
           "//third_party/crashpad/crashpad/handler:crashpad_handler_trampoline",
         ]
-        if (trichrome_shared_assets) {
-          deps += [ "//chrome/android:chrome_public_v8_assets" ]
-        }
         loadable_modules = [ "$root_out_dir/libcrashpad_handler_trampoline.so" ]
       }
     }