From adcf2b655d89b256c7be509509f41009b95f683a Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Mon, 7 Dec 2020 11:09:58 -0800
Subject: [PATCH] chore: migrate java-billing to the Java microgenerator

Committer: @miraleung
PiperOrigin-RevId: 346134186
---
 google/cloud/billing/v1/BUILD.bazel              | 11 +++++------
 google/cloud/billing/v1/cloud_billing_gapic.yaml |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/google/cloud/billing/v1/BUILD.bazel b/google/cloud/billing/v1/BUILD.bazel
index 2b0a585f..b78ec8fd 100644
--- a/google/cloud/billing/v1/BUILD.bazel
+++ b/google/cloud/billing/v1/BUILD.bazel
@@ -38,12 +38,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -61,11 +62,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "billing_java_gapic",
-    src = ":billing_proto_with_info",
-    gapic_yaml = "cloud_billing_gapic.yaml",
+    srcs = [":billing_proto_with_info"],
     grpc_service_config = "cloud_billing_grpc_service_config.json",
     package = "google.cloud.billing.v1",
-    service_yaml = "cloudbilling.yaml",
     test_deps = [
         ":billing_java_grpc",
         "//google/iam/v1:iam_java_grpc",
diff --git a/google/cloud/billing/v1/cloud_billing_gapic.yaml b/google/cloud/billing/v1/cloud_billing_gapic.yaml
index 66d708ce..a87baa09 100644
--- a/google/cloud/billing/v1/cloud_billing_gapic.yaml
+++ b/google/cloud/billing/v1/cloud_billing_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.billing.v1
   python:
     package_name: google.cloud.billing_v1.gapic
   go: