summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAditya Choudhary <caditya@google.com>2024-02-07 01:02:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-02-07 01:02:42 +0000
commit076f0ca85901b10531065985f57fa36838736aed (patch)
tree4ab9ff185ba4ce7b2ed4b43736c72740b7e75af8
parentc7e0bc8ba6e7379be74bbe216e3f9b42166aaf9b (diff)
parent5577e4828512373f769e69a4157f4d08d736aee2 (diff)
downloadTelecomm-076f0ca85901b10531065985f57fa36838736aed.tar.gz
Merge "Migrate Test Targets to New Android Ownership Model" into main am: 5577e48285temp_319669529
Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2946529 Change-Id: Ide83e390a0f5c8f4bb25665355ff389e990dfa6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--testapps/Android.bp1
-rw-r--r--testapps/callaudiotest/Android.bp1
-rw-r--r--testapps/carmodedialer/Android.bp1
-rw-r--r--testapps/companionapp/Android.bp1
-rw-r--r--testapps/streamingtest/Android.bp1
-rw-r--r--testapps/transactionalVoipApp/Android.bp1
7 files changed, 8 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 5ea55b11e..7a20f085e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6,8 +6,8 @@ package {
genrule {
name: "statslog-telecom-java-gen",
tools: ["stats-log-api-gen"],
- cmd: "$(location stats-log-api-gen) --java $(out) --module telecom"
- + " --javaPackage com.android.server.telecom --javaClass TelecomStatsLog",
+ cmd: "$(location stats-log-api-gen) --java $(out) --module telecom" +
+ " --javaPackage com.android.server.telecom --javaClass TelecomStatsLog",
out: ["com/android/server/telecom/TelecomStatsLog.java"],
}
diff --git a/testapps/Android.bp b/testapps/Android.bp
index 11ea4743f..45ea75327 100644
--- a/testapps/Android.bp
+++ b/testapps/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_telecom",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/testapps/callaudiotest/Android.bp b/testapps/callaudiotest/Android.bp
index 81164e6f4..d9962360e 100644
--- a/testapps/callaudiotest/Android.bp
+++ b/testapps/callaudiotest/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_telecom",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/testapps/carmodedialer/Android.bp b/testapps/carmodedialer/Android.bp
index 9f65b8c60..f142bf40e 100644
--- a/testapps/carmodedialer/Android.bp
+++ b/testapps/carmodedialer/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_telecom",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/testapps/companionapp/Android.bp b/testapps/companionapp/Android.bp
index 8718b373e..84ee4d307 100644
--- a/testapps/companionapp/Android.bp
+++ b/testapps/companionapp/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_telecom",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/testapps/streamingtest/Android.bp b/testapps/streamingtest/Android.bp
index bd0a582ea..8d5cd6c29 100644
--- a/testapps/streamingtest/Android.bp
+++ b/testapps/streamingtest/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_telecom",
default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/testapps/transactionalVoipApp/Android.bp b/testapps/transactionalVoipApp/Android.bp
index 68089e2ae..8bac8f1d4 100644
--- a/testapps/transactionalVoipApp/Android.bp
+++ b/testapps/transactionalVoipApp/Android.bp
@@ -15,6 +15,7 @@
//
package {
+ default_team: "trendy_team_fwk_telecom",
default_applicable_licenses: ["Android-Apache-2.0"],
}