Snap for 8426163 from 72badb3fe96d58f4495589b7256d3ca9e1fdce96 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I7338d39a2fb4ad77b0f4007964079342d9a13a44

3 files changed, 4 insertions, 57 deletions

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index cc59bbaa..00000000
--- a/Android.bp
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (C) 2021 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
-    default_applicable_licenses: ["external_opencensus-java_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_opencensus-java_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
diff --git a/api/Android.bp b/api/Android.bp
index 537d9696..003a4dee 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -14,29 +14,18 @@
 //
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_opencensus-java_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_opencensus-java_license"],
-}
-
-java_library {
+java_library_host {
     name: "opencensus-java-api",
-    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],
     plugins: [
-        "auto_value_plugin",
+        "dagger2-auto-value",
     ],
     libs: [
         "error_prone_annotations",
-        "auto_value_annotations",
+        "dagger2-auto-value",
         "grpc-java-context",
         "jsr305",
     ],
-    sdk_version: "current",
 }
diff --git a/contrib/grpc_metrics/Android.bp b/contrib/grpc_metrics/Android.bp
index 8770bd62..9d045184 100644
--- a/contrib/grpc_metrics/Android.bp
+++ b/contrib/grpc_metrics/Android.bp
@@ -14,18 +14,8 @@
 //
 //
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_opencensus-java_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["external_opencensus-java_license"],
-}
-
-java_library {
+java_library_host {
     name: "opencensus-java-contrib-grpc-metrics",
-    host_supported: true,
     srcs: [
         "src/main/java/**/*.java",
     ],
@@ -33,5 +23,4 @@ java_library {
         "opencensus-java-api",
         "guava",
     ],
-    sdk_version: "current",
 }