Merge "[DON'T BLOCK] Test ownership migration rules" into main
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index b2ffa22..d511d04 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -1,4 +1,5 @@
package {
+ default_team: "trendy_team_android_settings_app",
default_applicable_licenses: ["packages_apps_Settings_license"],
}
diff --git a/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp b/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp
index 145f3d6..9f753b2 100644
--- a/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp
+++ b/src/com/android/settings/biometrics/fingerprint2/lib/Android.bp
@@ -2,13 +2,17 @@
// unit/robo/screenshot etc.
//
// This library shouldn't have many dependencies.
+package {
+ default_team: "trendy_team_android_settings_app",
+}
+
android_library {
name: "FingerprintManagerInteractor",
srcs: [
- "**/*.kt"
+ "**/*.kt",
],
static_libs: [
- "BiometricsSharedLib",
- "kotlinx-coroutines-android",
+ "BiometricsSharedLib",
+ "kotlinx-coroutines-android",
],
-}
\ No newline at end of file
+}
diff --git a/tests/screenshot/Android.bp b/tests/screenshot/Android.bp
index 5989381..5130fe5 100644
--- a/tests/screenshot/Android.bp
+++ b/tests/screenshot/Android.bp
@@ -13,6 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_team: "trendy_team_android_settings_app",
+}
+
android_app {
name: "ScreenshotTestStub",
defaults: [
diff --git a/tests/shared/Android.bp b/tests/shared/Android.bp
index 27573e8..6fd9f64 100644
--- a/tests/shared/Android.bp
+++ b/tests/shared/Android.bp
@@ -1,7 +1,11 @@
+package {
+ default_team: "trendy_team_android_settings_app",
+}
+
android_library {
name: "Settings-testutils2",
srcs: [
- "src/**/*.kt"
+ "src/**/*.kt",
],
libs: [
"BiometricsSharedLib",