diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-12 20:55:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-12 20:55:57 +0000 |
commit | cca4e91fcfa5e3aa1cfb4a21b1c465211b8093c4 (patch) | |
tree | dca43fadb6001e6a18cafa3938b9d135743488af | |
parent | a6bec4e54166aa59d59b266e93446664a6802fbc (diff) | |
parent | 01735e6b40cf9156ffa9a30fcee453ee02b0f085 (diff) | |
download | Settings-cca4e91fcfa5e3aa1cfb4a21b1c465211b8093c4.tar.gz |
Merge "[DON'T BLOCK] Test ownership migration rules" into main
-rw-r--r-- | Android.bp | 16 | ||||
-rw-r--r-- | protos/Android.bp | 1 | ||||
-rw-r--r-- | src/com/android/settings/fuelgauge/protos/Android.bp | 1 | ||||
-rw-r--r-- | tests/anomaly-tester/Android.bp | 1 | ||||
-rw-r--r-- | tests/componenttests/Android.bp | 1 | ||||
-rw-r--r-- | tests/legacy_unit/InstrumentedEntitlementApp/Android.bp | 1 | ||||
-rw-r--r-- | tests/perftests/Android.bp | 1 | ||||
-rw-r--r-- | tests/robotests/Android.bp | 1 | ||||
-rw-r--r-- | tests/spa_unit/Android.bp | 1 | ||||
-rw-r--r-- | tests/uitests/Android.bp | 1 | ||||
-rw-r--r-- | tests/unit/Android.bp | 1 |
11 files changed, 21 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index 31895db32b1..9599f9d5c05 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", default_applicable_licenses: ["packages_apps_Settings_license"], } @@ -23,8 +24,8 @@ java_library { genrule { name: "statslog-settings-java-gen", tools: ["stats-log-api-gen"], - cmd: "$(location stats-log-api-gen) --java $(out) --module settings" - + " --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog", + cmd: "$(location stats-log-api-gen) --java $(out) --module settings" + + " --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog", out: ["com/android/settings/core/instrumentation/SettingsStatsLog.java"], } @@ -43,7 +44,6 @@ java_library { ], } - // Build the Settings APK android_library { name: "Settings-core", @@ -54,7 +54,10 @@ android_library { "SpaPrivilegedLib-defaults", ], - srcs: ["src/**/*.java", "src/**/*.kt"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], resource_dirs: [ "res", "res-export", // for external usage @@ -158,7 +161,10 @@ filegroup { // separately for different modules. filegroup { name: "Settings_srcs", - srcs: ["src/**/*.java", "src/**/*.kt"], + srcs: [ + "src/**/*.java", + "src/**/*.kt", + ], } // Deprecated. Do not depend on this, only depend on Settings-core, and its manifest is also diff --git a/protos/Android.bp b/protos/Android.bp index d546e2db7fe..560851a0862 100644 --- a/protos/Android.bp +++ b/protos/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/src/com/android/settings/fuelgauge/protos/Android.bp b/src/com/android/settings/fuelgauge/protos/Android.bp index 531bdc32293..462962b63c5 100644 --- a/src/com/android/settings/fuelgauge/protos/Android.bp +++ b/src/com/android/settings/fuelgauge/protos/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp index 0b05e04ffac..d437a6c9de3 100644 --- a/tests/anomaly-tester/Android.bp +++ b/tests/anomaly-tester/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/componenttests/Android.bp b/tests/componenttests/Android.bp index 300a338bd50..48d3ab0af5c 100644 --- a/tests/componenttests/Android.bp +++ b/tests/componenttests/Android.bp @@ -2,6 +2,7 @@ // Settings Component test target. # //############################################################ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp index 1ec108a53bc..cc0e63d00dc 100644 --- a/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp +++ b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp index 7d3b75bb021..7e3a8aa6c75 100644 --- a/tests/perftests/Android.bp +++ b/tests/perftests/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index ad8361e2086..a40c044ff8e 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -3,6 +3,7 @@ //############################################################ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/spa_unit/Android.bp b/tests/spa_unit/Android.bp index 0bd561348ef..61f68bd5cf3 100644 --- a/tests/spa_unit/Android.bp +++ b/tests/spa_unit/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_android_settings_app", default_applicable_licenses: ["packages_apps_Settings_license"], } diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp index 5e83dbcd22c..31bfdc2688b 100644 --- a/tests/uitests/Android.bp +++ b/tests/uitests/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 3ac08427330..b4b79dd3320 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_android_settings_app", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "packages_apps_Settings_license" |