Use variables to refer to proto runtime and compiler

Internal checkouts can use a different protocol buffers and runtime,
thus use variables to refer to them so they could be changed based on
your checkout.

TBR=# noop change to proto runtime target name

Bug: 1114836
Change-Id: I564b5f7bfa65ff549c335766c26b2d1dd07241fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2346861
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797375}

android_webview/BUILD.gn

@@ -570,7 +570,7 @@ android_library("browser_java") {
     "//net/android:net_java",
     "//services/network/public/mojom:mojom_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/blink/public:blink_headers_java",
     "//ui/android:ui_java",
     "//url:gurl_java",
@@ -597,7 +597,7 @@ android_library("common_variations_java") {
     "//base:base_java",
     "//components/variations/android:variations_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
   ]
 }
 

android_webview/nonembedded/BUILD.gn

@@ -32,7 +32,7 @@ android_library("nonembedded_java") {
     "//components/embedder_support/android:application_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//ui/android:ui_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -103,7 +103,7 @@ android_library("services_java") {
     "//components/version_info/android:version_constants_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
   ]
 }
 

android_webview/test/BUILD.gn

@@ -206,8 +206,8 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_guava_failureaccess_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:espresso_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/blink/public/mojom:web_feature_mojo_bindings_java",
@@ -515,7 +515,7 @@ junit_binary("android_webview_junit_tests") {
     "//base:base_junit_test_support",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_test_runner_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_support_test_runner:runner_java",
   ]
 

build/config/android/config.gni

@@ -129,6 +129,12 @@ if (is_android || is_chromeos) {
         "//third_party/android_deps:com_google_android_material_material_java"
   }
 
+  if (!defined(android_protoc_bin)) {
+    android_protoc_bin = "//third_party/android_protoc/protoc"
+    android_proto_runtime =
+        "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java"
+  }
+
   webview_public_framework_dep =
       "//third_party/android_sdk:public_framework_system_java"
   if (!defined(webview_framework_dep)) {

build/config/android/rules.gni

@@ -4009,10 +4009,6 @@ if (enable_java_templates) {
   #   proto_path (required)
   #       Root directory of .proto files.
   #
-  #   generate_nano (optional, default false)
-  #       Whether to generate nano protos. If false, this will use the lite proto generator.
-  #       Nano protos are deprecated, so please use lite new proto libraries.
-  #
   #   deps (optional)
   #       Additional dependencies. Passed through to both the action and the
   #       android_library targets.
@@ -4032,22 +4028,7 @@ if (enable_java_templates) {
   template("proto_java_library") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
-    _generate_nano =
-        defined(invoker.generate_nano) && invoker.generate_nano == true
-
-    if (_generate_nano) {
-      # Use the legacy Android nano proto generator.
-      _protoc_dep =
-          "//third_party/android_protobuf:android_protoc($host_toolchain)"
-      _protoc_out_dir = get_label_info(_protoc_dep, "root_out_dir")
-      _protoc_bin = "$_protoc_out_dir/android_protoc"
-      _proto_runtime = "//third_party/android_protobuf:protobuf_nano_javalib"
-    } else {
-      # Use the regular proto library to generate lite protos.
-      _protoc_bin = "//third_party/android_protoc/protoc"
-      _proto_runtime = "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java"
-    }
-    _proto_path = invoker.proto_path
+
     _template_name = target_name
 
     action_with_pydeps("${_template_name}__protoc_java") {
@@ -4057,9 +4038,6 @@ if (enable_java_templates) {
       script = "//build/protoc_java.py"
 
       deps = []
-      if (defined(_protoc_dep)) {
-        deps += [ _protoc_dep ]
-      }
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
@@ -4071,9 +4049,9 @@ if (enable_java_templates) {
                "--depfile",
                rebase_path(depfile, root_build_dir),
                "--protoc",
-               rebase_path(_protoc_bin, root_build_dir),
+               rebase_path(android_protoc_bin, root_build_dir),
                "--proto-path",
-               rebase_path(_proto_path, root_build_dir),
+               rebase_path(invoker.proto_path, root_build_dir),
                "--srcjar",
                rebase_path(_srcjar_path, root_build_dir),
              ] + rebase_path(sources, root_build_dir)
@@ -4086,17 +4064,13 @@ if (enable_java_templates) {
           ]
         }
       }
-
-      if (_generate_nano) {
-        args += [ "--nano" ]
-      }
     }
 
     android_library(target_name) {
       chromium_code = false
       sources = []
       srcjar_deps = [ ":${_template_name}__protoc_java" ]
-      deps = [ _proto_runtime ]
+      deps = [ android_proto_runtime ]
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }

chrome/android/BUILD.gn

@@ -484,9 +484,9 @@ android_library("chrome_java") {
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",
     "//third_party/android_deps:com_google_guava_listenablefuture_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_sdk:android_gcm_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
@@ -871,8 +871,8 @@ junit_binary("chrome_junit_tests") {
     "//third_party/android_deps:androidx_test_core_java",
     "//third_party/android_deps:androidx_test_runner_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
@@ -1131,9 +1131,9 @@ android_library("chrome_test_java") {
     # to androidx.
     "//third_party/android_deps:com_android_support_recyclerview_v7_java",
     "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_sdk:android_test_mock_java",
     "//third_party/android_sdk:android_test_runner_java",
@@ -1888,7 +1888,7 @@ android_library("browser_java_test_support") {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/junit",
   ]
 }

chrome/android/features/autofill_assistant/BUILD.gn

@@ -235,7 +235,7 @@ android_library("autofill_assistant_java_test_support") {
     "//components/autofill_assistant/browser:proto_java",
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
@@ -301,9 +301,9 @@ android_library("test_java") {
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_test_runner_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:espresso_java",
     "//third_party/android_deps:material_design_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/hamcrest:hamcrest_java",

chrome/browser/optimization_guide/android/BUILD.gn

@@ -20,7 +20,7 @@ android_library("java") {
     "//components/optimization_guide/proto:optimization_guide_proto_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
   ]
 
   srcjar_deps =

chrome/browser/tab/BUILD.gn

@@ -59,7 +59,7 @@ android_library("java") {
     "//net/android:net_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
-    "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+    "//third_party/android_deps:protobuf_lite_runtime_java",
     "//ui/android:ui_full_java",
     "//url:gurl_java",
     "//url:origin_java",

chrome/browser/thumbnail/generator/BUILD.gn

@@ -79,7 +79,7 @@ if (is_android) {
       "//third_party/android_deps:android_support_v4_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_deps:androidx_collection_collection_java",
-      "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+      "//third_party/android_deps:protobuf_lite_runtime_java",
     ]
 
     sources = [

components/background_task_scheduler/internal/BUILD.gn

@@ -36,7 +36,7 @@ if (is_android) {
       "//components/background_task_scheduler:public_java",
       "//content/public/android:content_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
-      "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
+      "//third_party/android_deps:protobuf_lite_runtime_java",
     ]
   }
 

third_party/android_deps/BUILD.gn

@@ -83,6 +83,10 @@ java_group("material_design_java") {
   deps = [ "$material_design_target" ]
 }
 
+java_group("protobuf_lite_runtime_java") {
+  deps = [ "$android_proto_runtime" ]
+}
+
 java_annotation_processor("auto_service_processor") {
   main_class = "com.google.auto.service.processor.AutoServiceProcessor"
   deps = [ ":com_google_auto_service_auto_service_java" ]