Merge "Migrate Test Targets to New Android Ownership Model" into main

27 files changed, 50 insertions, 20 deletions

diff --git a/apps/BuildWidget/Android.bp b/apps/BuildWidget/Android.bp
index af3b50289..e30b4047d 100644
--- a/apps/BuildWidget/Android.bp
+++ b/apps/BuildWidget/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_system_ui_please_use_a_more_specific_subteam_if_possible_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/apps/DumpViewer/app/src/main/Android.bp b/apps/DumpViewer/app/src/main/Android.bp
index a67de47d9..cc3f84be9 100644
--- a/apps/DumpViewer/app/src/main/Android.bp
+++ b/apps/DumpViewer/app/src/main/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_framework_backstage_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/apps/GestureBuilder/Android.bp b/apps/GestureBuilder/Android.bp
index 4e9c27a3c..c466000ee 100644
--- a/apps/GestureBuilder/Android.bp
+++ b/apps/GestureBuilder/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_android_developer_tools",
     // See: http://go/android-license-faq
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/apps/NinePatchLab/Android.bp b/apps/NinePatchLab/Android.bp
index 96c3a9423..96fd85f96 100644
--- a/apps/NinePatchLab/Android.bp
+++ b/apps/NinePatchLab/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_chrome",
     // See: http://go/android-license-faq
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/apps/PushApiAuthenticator/Android.bp b/apps/PushApiAuthenticator/Android.bp
index 1d45d7935..1556516d8 100644
--- a/apps/PushApiAuthenticator/Android.bp
+++ b/apps/PushApiAuthenticator/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_authentication",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/apps/PushApiTestAppOne/Android.bp b/apps/PushApiTestAppOne/Android.bp
index d4fda4f0e..a41bc5c3e 100644
--- a/apps/PushApiTestAppOne/Android.bp
+++ b/apps/PushApiTestAppOne/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_authentication",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/apps/PushApiTestAppTwo/Android.bp b/apps/PushApiTestAppTwo/Android.bp
index 5d37a44d3..8e1ee5f05 100644
--- a/apps/PushApiTestAppTwo/Android.bp
+++ b/apps/PushApiTestAppTwo/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_authentication",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/apps/SettingInjectorSample/Android.bp b/apps/SettingInjectorSample/Android.bp
index d70ee0209..cd318cdeb 100644
--- a/apps/SettingInjectorSample/Android.bp
+++ b/apps/SettingInjectorSample/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_renderscript_nnapi",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/cmds/monkey/Android.bp b/cmds/monkey/Android.bp
index 85e12c675..884cef2a3 100644
--- a/cmds/monkey/Android.bp
+++ b/cmds/monkey/Android.bp
@@ -2,6 +2,7 @@
 //
 
 package {
+    default_team: "trendy_team_platform_build",
     // See: http://go/android-license-faq
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/gki/Android.bp b/gki/Android.bp
index f06fe6f16..784250bf9 100644
--- a/gki/Android.bp
+++ b/gki/Android.bp
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_kernel",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/AconfigDemo/tests/Android.bp b/samples/AconfigDemo/tests/Android.bp
index 5034643d3..f4a49be08 100644
--- a/samples/AconfigDemo/tests/Android.bp
+++ b/samples/AconfigDemo/tests/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_core_experiments",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/AconfigDemo/tests/unittests/Android.bp b/samples/AconfigDemo/tests/unittests/Android.bp
index 96de23443..84a52c980 100644
--- a/samples/AconfigDemo/tests/unittests/Android.bp
+++ b/samples/AconfigDemo/tests/unittests/Android.bp
@@ -1,3 +1,7 @@
+package {
+    default_team: "trendy_team_android_core_experiments",
+}
+
 java_library_host {
     name: "ContentLibsHost",
     srcs: [
diff --git a/samples/ApiDemos/Android.bp b/samples/ApiDemos/Android.bp
index 10703a066..e3f0172a6 100644
--- a/samples/ApiDemos/Android.bp
+++ b/samples/ApiDemos/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_multitasking_windowing",
     // See: http://go/android-license-faq
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/samples/ApiDemos/tests/Android.bp b/samples/ApiDemos/tests/Android.bp
index abb7fd79f..16673d768 100644
--- a/samples/ApiDemos/tests/Android.bp
+++ b/samples/ApiDemos/tests/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_updatable_sdk_apis",
     // See: http://go/android-license-faq
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/samples/AppNavigation/Android.bp b/samples/AppNavigation/Android.bp
index 1013538b4..4d69bbb5a 100644
--- a/samples/AppNavigation/Android.bp
+++ b/samples/AppNavigation/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_ui_toolkit",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/BrokenKeyDerivation/tests/Android.bp b/samples/BrokenKeyDerivation/tests/Android.bp
index 94a5c402a..e5f7ca050 100644
--- a/samples/BrokenKeyDerivation/tests/Android.bp
+++ b/samples/BrokenKeyDerivation/tests/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_updatable_sdk_apis",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/DataWiper/Android.bp b/samples/DataWiper/Android.bp
index 8243f7d63..08f2ac1a4 100644
--- a/samples/DataWiper/Android.bp
+++ b/samples/DataWiper/Android.bp
@@ -17,6 +17,7 @@
 // We build two apps from the same source
 
 package {
+    default_team: "trendy_team_framework_backstage_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/DeviceAdminWhitelistedAccount/Android.bp b/samples/DeviceAdminWhitelistedAccount/Android.bp
index 164e3609a..146ab05c3 100644
--- a/samples/DeviceAdminWhitelistedAccount/Android.bp
+++ b/samples/DeviceAdminWhitelistedAccount/Android.bp
@@ -17,6 +17,7 @@
 // We build two apps from the same source
 
 package {
+    default_team: "trendy_team_framework_backstage_power",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/IntentPlayground/Android.bp b/samples/IntentPlayground/Android.bp
index 3890bb3f4..53843fc48 100644
--- a/samples/IntentPlayground/Android.bp
+++ b/samples/IntentPlayground/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_platform_enabler_framework_make_pixel_",
     // See: http://go/android-license-faq
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
diff --git a/samples/SampleSyncAdapter/Android.bp b/samples/SampleSyncAdapter/Android.bp
index b415834ab..4356f61e3 100644
--- a/samples/SampleSyncAdapter/Android.bp
+++ b/samples/SampleSyncAdapter/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_native_tools_libraries",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/ShortcutDemo/Android.bp b/samples/ShortcutDemo/Android.bp
index 5fdf54998..29944d6f7 100644
--- a/samples/ShortcutDemo/Android.bp
+++ b/samples/ShortcutDemo/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_partner_eng",
     // See: http://go/android-license-faq
     default_applicable_licenses: [
         "Android-Apache-2.0",
@@ -26,13 +27,13 @@ android_test {
         "--rename-manifest-package com.example.android.pm.shortcutlauncherdemo",
     ],
     srcs: [
-	"common/src/**/*.java",
-	"launcher/src/**/*.java",
+        "common/src/**/*.java",
+        "launcher/src/**/*.java",
     ],
     resource_dirs: [
-    	"common/res",
-	"launcher/res",
-	"launcher/res1",
+        "common/res",
+        "launcher/res",
+        "launcher/res1",
     ],
     static_libs: [
         "androidx.legacy_legacy-support-v4",
@@ -49,13 +50,13 @@ android_test {
         "--rename-manifest-package com.example.android.pm.shortcutlauncherdemo2",
     ],
     srcs: [
-    	"common/src/**/*.java",
-	"launcher/src/**/*.java",
+        "common/src/**/*.java",
+        "launcher/src/**/*.java",
     ],
     resource_dirs: [
-    	"common/res",
+        "common/res",
         "launcher/res",
-	"launcher/res2",
+        "launcher/res2",
     ],
     static_libs: [
         "androidx.legacy_legacy-support-v4",
@@ -73,13 +74,13 @@ android_test {
         "--rename-manifest-package com.example.android.pm.shortcutdemo",
     ],
     srcs: [
-    	"common/src/**/*.java",
-	"publisher/src/**/*.java",
+        "common/src/**/*.java",
+        "publisher/src/**/*.java",
     ],
     resource_dirs: [
-    	"common/res",
-	"publisher/res",
-	"publisher/res1",
+        "common/res",
+        "publisher/res",
+        "publisher/res1",
     ],
     manifest: "publisher/AndroidManifest.xml",
     sdk_version: "current",
@@ -93,13 +94,13 @@ android_test {
         "--rename-manifest-package com.example.android.pm.shortcutdemo2",
     ],
     srcs: [
-    	"common/src/**/*.java",
-	"publisher/src/**/*.java",
+        "common/src/**/*.java",
+        "publisher/src/**/*.java",
     ],
     resource_dirs: [
-    	"common/res",
-	"publisher/res",
-	"publisher/res2",
+        "common/res",
+        "publisher/res",
+        "publisher/res2",
     ],
     manifest: "publisher/AndroidManifest.xml",
     sdk_version: "current",
diff --git a/samples/StackWidget/Android.bp b/samples/StackWidget/Android.bp
index d8e8601b6..3a47113fe 100644
--- a/samples/StackWidget/Android.bp
+++ b/samples/StackWidget/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_system_ui_please_use_a_more_specific_subteam_if_possible_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/Vault/tests/Android.bp b/samples/Vault/tests/Android.bp
index 4076d7a04..f2570bbb3 100644
--- a/samples/Vault/tests/Android.bp
+++ b/samples/Vault/tests/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_storage",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/samples/WeatherListWidget/Android.bp b/samples/WeatherListWidget/Android.bp
index 55d4335f3..934afc683 100644
--- a/samples/WeatherListWidget/Android.bp
+++ b/samples/WeatherListWidget/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_multitasking_windowing",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/scripts/Android.bp b/scripts/Android.bp
index 45011d6eb..048dc1f86 100644
--- a/scripts/Android.bp
+++ b/scripts/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_native_tools_libraries",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -57,7 +58,7 @@ python_test_host {
     ],
     libs: [
         "pyfakefs",
-    ]
+    ],
 }
 
 python_test_host {
diff --git a/tools/cargo_embargo/Android.bp b/tools/cargo_embargo/Android.bp
index ffd50db43..2e6eab4c4 100644
--- a/tools/cargo_embargo/Android.bp
+++ b/tools/cargo_embargo/Android.bp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 package {
+    default_team: "trendy_team_android_rust",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp
index b1525d3e3..541f2064d 100644
--- a/vndk/tools/header-checker/Android.bp
+++ b/vndk/tools/header-checker/Android.bp
@@ -15,6 +15,7 @@
 //
 
 package {
+    default_team: "trendy_team_treble",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }