Port custom_tabs_client from GYP to GN

BUG=535071
TEST=None

Review URL: https://codereview.chromium.org/1358243006

Cr-Original-Commit-Position: refs/heads/master@{#352617}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0a2255e0c2f960fc29c467d1b6a1ecc0dd49e14b

config/android/internal_rules.gni

@@ -1194,6 +1194,11 @@ template("java_library_impl") {
   _requires_android =
       defined(invoker.requires_android) && invoker.requires_android
   assert(_requires_android || true)  # Mark as used.
+  _android_manifest = "//build/android/AndroidManifest.xml"
+  if (defined(invoker.android_manifest)) {
+    _android_manifest = invoker.android_manifest
+  }
+  assert(_android_manifest != "")  # Mark as used.
   _run_findbugs = defined(invoker.run_findbugs) && invoker.run_findbugs
   assert(_run_findbugs || true)  # Mark as used.
 
@@ -1318,11 +1323,6 @@ template("java_library_impl") {
 
   if (_supports_android) {
     if (defined(invoker.chromium_code) && invoker.chromium_code) {
-      _android_manifest = "//build/android/AndroidManifest.xml"
-      if (defined(invoker.android_manifest)) {
-        _android_manifest = invoker.android_manifest
-      }
-
       _final_datadeps += [ ":${_template_name}__lint" ]
       android_lint("${_template_name}__lint") {
         android_manifest = _android_manifest

config/android/rules.gni

@@ -1108,6 +1108,7 @@ template("android_java_prebuilt") {
 # Variables
 #   android_manifest: Path to AndroidManifest.xml.
 #   android_manifest_dep: Target that generates AndroidManifest (if applicable)
+#   chromium_code: If true, extra analysis warning/errors will be enabled.
 #   data_deps: List of dependencies needed at runtime. These will be built but
 #     won't change the generated .apk in any way (in fact they may be built
 #     after the .apk is).
@@ -1386,6 +1387,10 @@ template("android_apk") {
 
     android_manifest = _android_manifest
     chromium_code = true
+    if (defined(invoker.chromium_code)) {
+      chromium_code = invoker.chromium_code
+    }
+
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     } else if (defined(invoker.DEPRECATED_java_in_dir)) {

gn_migration.gypi

@@ -357,6 +357,7 @@
             '../chrome/chrome.gyp:chrome_public_apk',
             '../chrome/chrome.gyp:chrome_public_test_apk',
             '../chrome/chrome.gyp:chromedriver_webview_shell_apk',
+            '../third_party/custom_tabs_client/custom_tabs_client.gyp:custom_tabs_client_example_apk',
           ],
         }],
         ['OS=="android" or OS=="linux"', {

secondary/third_party/android_tools/BUILD.gn

@@ -49,6 +49,10 @@ android_java_prebuilt("android_support_design_java") {
   jar_path = "$android_sdk_root/extras/android/support/design/libs/android-support-design.jar"
 }
 
+android_java_prebuilt("android_support_annotations_javalib") {
+  jar_path = "$android_sdk_root/extras/android/support/annotations/android-support-annotations.jar"
+}
+
 java_prebuilt("android_support_multidex_java") {
   supports_android = true
   jar_path = "$android_sdk_root/extras/android/support/multidex/library/libs/android-support-multidex.jar"
@@ -126,7 +130,9 @@ android_java_prebuilt("google_play_services_default_java") {
 
   # TODO(dgn) deps should not complain about having a custom action here
   # Currently, there is no guarantee that the data_deps actions will complete before the current one runs
-  data_deps = [ ":check_sdk_extras_version" ]
+  data_deps = [
+    ":check_sdk_extras_version",
+  ]
   jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
 }