From fe09091214c715856ecae3c3daf9836238ee3cbe Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 10 May 2021 10:38:53 -0700
Subject: [PATCH] Set dist_group: "android" for frameworks/base
 java_sdk_libraries

dist_group replaces owner and the default is going to change, set it
to the current default "android" for frameworks/base java_sdk_libraries.

Bug: 186723288
Test: m checkbuild
Change-Id: I1526853951bcffbe5c5aec6fbc6ba8e0dbea95ad
---
 libs/usb/Android.bp                | 1 +
 location/lib/Android.bp            | 1 +
 media/lib/remotedisplay/Android.bp | 1 +
 media/lib/signer/Android.bp        | 1 +
 media/lib/tvremote/Android.bp      | 3 ++-
 nfc-extras/Android.bp              | 1 +
 obex/Android.bp                    | 1 +
 test-base/Android.bp               | 1 +
 test-mock/Android.bp               | 1 +
 test-runner/Android.bp             | 1 +
 10 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libs/usb/Android.bp b/libs/usb/Android.bp
index edc847487dcb..e685a73e4249 100644
--- a/libs/usb/Android.bp
+++ b/libs/usb/Android.bp
@@ -28,4 +28,5 @@ java_sdk_library {
     name: "com.android.future.usb.accessory",
     srcs: ["src/**/*.java"],
     api_packages: ["com.android.future.usb"],
+    dist_group: "android",
 }
diff --git a/location/lib/Android.bp b/location/lib/Android.bp
index 696125ca586a..c9be5797fdbc 100644
--- a/location/lib/Android.bp
+++ b/location/lib/Android.bp
@@ -33,4 +33,5 @@ java_sdk_library {
         "com.android.location.provider",
         "com.android.location.timezone.provider",
     ],
+    dist_group: "android",
 }
diff --git a/media/lib/remotedisplay/Android.bp b/media/lib/remotedisplay/Android.bp
index bfb0cb854be3..e1d7caed9528 100644
--- a/media/lib/remotedisplay/Android.bp
+++ b/media/lib/remotedisplay/Android.bp
@@ -27,4 +27,5 @@ java_sdk_library {
     name: "com.android.media.remotedisplay",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.media.remotedisplay"],
+    dist_group: "android",
 }
diff --git a/media/lib/signer/Android.bp b/media/lib/signer/Android.bp
index 6504176eb6f1..65a6073a44ee 100644
--- a/media/lib/signer/Android.bp
+++ b/media/lib/signer/Android.bp
@@ -27,4 +27,5 @@ java_sdk_library {
     name: "com.android.mediadrm.signer",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.mediadrm.signer"],
+    dist_group: "android",
 }
diff --git a/media/lib/tvremote/Android.bp b/media/lib/tvremote/Android.bp
index a58f677c3c30..11c184bfb5f1 100644
--- a/media/lib/tvremote/Android.bp
+++ b/media/lib/tvremote/Android.bp
@@ -31,6 +31,7 @@ java_sdk_library {
         enabled: false,
     },
     static_libs: [
-        "android-support-annotations"
+        "android-support-annotations",
     ],
+    dist_group: "android",
 }
diff --git a/nfc-extras/Android.bp b/nfc-extras/Android.bp
index 43b2830f544b..cb9ac6fd1d33 100644
--- a/nfc-extras/Android.bp
+++ b/nfc-extras/Android.bp
@@ -27,4 +27,5 @@ java_sdk_library {
     name: "com.android.nfc_extras",
     srcs: ["java/**/*.java"],
     api_packages: ["com.android.nfc_extras"],
+    dist_group: "android",
 }
diff --git a/obex/Android.bp b/obex/Android.bp
index 95eac81e80be..37e7f76bead5 100644
--- a/obex/Android.bp
+++ b/obex/Android.bp
@@ -48,4 +48,5 @@ java_sdk_library {
     name: "javax.obex",
     srcs: ["javax/**/*.java"],
     api_packages: ["javax.obex"],
+    dist_group: "android",
 }
diff --git a/test-base/Android.bp b/test-base/Android.bp
index b58aa11597c2..97ebba689d8b 100644
--- a/test-base/Android.bp
+++ b/test-base/Android.bp
@@ -55,6 +55,7 @@ java_sdk_library {
     hiddenapi_additional_annotations: [
         "android.test.base-hiddenapi-annotations",
     ],
+    dist_group: "android",
 }
 
 // Build the android.test.base_static library
diff --git a/test-mock/Android.bp b/test-mock/Android.bp
index 107292c81ab4..460a26d63cd6 100644
--- a/test-mock/Android.bp
+++ b/test-mock/Android.bp
@@ -48,6 +48,7 @@ java_sdk_library {
     ],
     compile_dex: true,
     default_to_stubs: true,
+    dist_group: "android",
 }
 
 // Make the current.txt available for use by the cts/tests/signature tests.
diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index c380ae3a243b..0f56bb3819f1 100644
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -52,6 +52,7 @@ java_sdk_library {
 
     compile_dex: true,
     default_to_stubs: true,
+    dist_group: "android",
 }
 
 // Build the android.test.runner-minus-junit library