Rename first variant for ExtServices to _tplus.
Test: atest
Bug: 282185097
Change-Id: Ida5daad25dccadefa48961d2bd2abb4ea3619bb1
diff --git a/Android.bp b/Android.bp
index baeffd3..0c9061f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,7 @@
}
android_app {
- name: "ExtServices",
+ name: "ExtServices-tplus",
sdk_version: "module_current",
min_sdk_version: "30",
manifest: "AndroidManifest.xml",
@@ -76,7 +76,7 @@
proguard_flags_files: ["proguard.proguard"],
},
privileged: true,
- privapp_allowlist: ":privapp_allowlist_android.ext.services.xml",
+ privapp_allowlist: ":privapp_allowlist_android.ext_tplus.services.xml",
static_libs: [
"ExtServices-core",
],
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8333156..bcaa5c8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -14,10 +14,10 @@
],
"mainline-presubmit": [
{
- "name": "ExtServicesUnitTests[com.google.android.extservices.apex]"
+ "name": "ExtServicesUnitTests[com.google.android.extservices_tplus.apex]"
},
{
- "name": "libextservices_test[com.google.android.extservices.apex]"
+ "name": "libextservices_test[com.google.android.extservices_tplus.apex]"
}
]
}
diff --git a/apex/Android.bp b/apex/Android.bp
index b234743..88344ee 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -22,15 +22,15 @@
}
apex {
- name: "com.android.extservices",
+ name: "com.android.extservices_tplus",
+ apex_available_name: "com.android.extservices",
defaults: ["com.android.extservices-defaults"],
- apps: ["ExtServices"],
+ apps: ["ExtServices-tplus"],
variant_version: "3",
}
apex {
- name: "com.android.extservices_sminus",
- apex_available_name: "com.android.extservices",
+ name: "com.android.extservices",
defaults: ["com.android.extservices-defaults"],
apps: ["ExtServices-sminus"],
java_libs: ["android.ext.adservices"],
diff --git a/apex/permissions/Android.bp b/apex/permissions/Android.bp
index 0456562..0c2cc4e 100644
--- a/apex/permissions/Android.bp
+++ b/apex/permissions/Android.bp
@@ -22,8 +22,8 @@
}
filegroup {
- name: "privapp_allowlist_android.ext.services.xml",
- srcs: ["android.ext.services.xml"],
+ name: "privapp_allowlist_android.ext_tplus.services.xml",
+ srcs: ["android.ext_tplus.services.xml"],
}
filegroup {
diff --git a/apex/permissions/android.ext.services.xml b/apex/permissions/android.ext_tplus.services.xml
similarity index 100%
rename from apex/permissions/android.ext.services.xml
rename to apex/permissions/android.ext_tplus.services.xml
diff --git a/java/tests/AndroidTest.xml b/java/tests/AndroidTest.xml
index 8202164..ce3330d 100644
--- a/java/tests/AndroidTest.xml
+++ b/java/tests/AndroidTest.xml
@@ -18,7 +18,7 @@
<option name="test-file-name" value="ExtServicesUnitTests.apk" />
</target_preparer>
- <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
+ <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="framework-base-presubmit" />
<option name="test-tag" value="ExtServicesUnitTests" />
diff --git a/native/tests/AndroidTest.xml b/native/tests/AndroidTest.xml
index 5bc2ddf..c9d7a05 100644
--- a/native/tests/AndroidTest.xml
+++ b/native/tests/AndroidTest.xml
@@ -21,7 +21,7 @@
<option name="push" value="test_data->/data/local/tmp/test_data" />
</target_preparer>
- <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
+ <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="mts" />
