summaryrefslogtreecommitdiff
path: root/tests/libs-permissions
diff options
context:
space:
mode:
authorJeongik Cha <jeongik@google.com>2019-07-04 21:12:06 +0900
committerJustin Yun <justinyun@google.com>2019-09-23 22:00:50 +0000
commitf6629839d1c10f3df70c8565e5a18f03f9b076e1 (patch)
tree4c6f7e81fbd4e51248c5ceea5d7b60f5e5ef64d9 /tests/libs-permissions
parentff044e701f5f0e535edd602d46b770384ddb2750 (diff)
Support /system_ext partition
This commit is mainly from I7a6a30bf8e8db9f2738594d187bb9148f138b8da, so test cases and features are mostly same. We change product_services partition name to "system_ext" because this partition's purpose changes. - installing a RRO package for framework from /system_ext/overlay - installing apps from /system_ext/app - installing priv-apps from /system_ext/priv-app - installing permissions from /system_ext/etc/[default-permissions|permissions|sysconfig] Bug: 134359158 Test: `mma` under frameworks/base/tests/[libs|privapp]-permissions adb sync && adb reboot adb shell cmd package list libraries => confirmed com.android.test.libs.system_ext library adb shell cmd package dump \ com.android.framework.permission.privapp.tests.system_ext => confirmed that the package is a priv-app Change-Id: Ibbccbba64156a7bc464ffb3785fb8fe69ebb973c Merged-In: Ibbccbba64156a7bc464ffb3785fb8fe69ebb973c (cherry picked from commit 9ec059ac1d38637855d9ab91e25a28164aa93b24)
Diffstat (limited to 'tests/libs-permissions')
-rw-r--r--tests/libs-permissions/Android.bp14
-rw-r--r--tests/libs-permissions/system_ext/com.android.test.libs.system_ext.xml (renamed from tests/libs-permissions/product_services/com.android.test.libs.product_services.xml)4
-rw-r--r--tests/libs-permissions/system_ext/java/com/android/test/libs/system_ext/LibsSystemExtTest.java (renamed from tests/libs-permissions/product_services/java/com/android/test/libs/product_services/LibsProductServicesTest.java)6
3 files changed, 12 insertions, 12 deletions
diff --git a/tests/libs-permissions/Android.bp b/tests/libs-permissions/Android.bp
index c7c4b10a8405..330bfc9022df 100644
--- a/tests/libs-permissions/Android.bp
+++ b/tests/libs-permissions/Android.bp
@@ -14,16 +14,16 @@ prebuilt_etc {
}
java_library {
- name: "com.android.test.libs.product_services",
+ name: "com.android.test.libs.system_ext",
installable: true,
- product_services_specific: true,
- srcs: ["product_services/java/**/*.java"],
- required: ["com.android.test.libs.product_services.xml"],
+ system_ext_specific: true,
+ srcs: ["system_ext/java/**/*.java"],
+ required: ["com.android.test.libs.system_ext.xml"],
}
prebuilt_etc {
- name: "com.android.test.libs.product_services.xml",
- src: "product_services/com.android.test.libs.product_services.xml",
+ name: "com.android.test.libs.system_ext.xml",
+ src: "system_ext/com.android.test.libs.system_ext.xml",
sub_dir: "permissions",
- product_services_specific: true,
+ system_ext_specific: true,
}
diff --git a/tests/libs-permissions/product_services/com.android.test.libs.product_services.xml b/tests/libs-permissions/system_ext/com.android.test.libs.system_ext.xml
index 082a9be80779..fa56004415f9 100644
--- a/tests/libs-permissions/product_services/com.android.test.libs.product_services.xml
+++ b/tests/libs-permissions/system_ext/com.android.test.libs.system_ext.xml
@@ -15,6 +15,6 @@
-->
<permissions>
- <library name="com.android.test.libs.product_services"
- file="/product_services/framework/com.android.test.libs.product_services.jar" />
+ <library name="com.android.test.libs.system_ext"
+ file="/system_ext/framework/com.android.test.libs.system_ext.jar" />
</permissions>
diff --git a/tests/libs-permissions/product_services/java/com/android/test/libs/product_services/LibsProductServicesTest.java b/tests/libs-permissions/system_ext/java/com/android/test/libs/system_ext/LibsSystemExtTest.java
index dcbdae809889..9999aba37d8d 100644
--- a/tests/libs-permissions/product_services/java/com/android/test/libs/product_services/LibsProductServicesTest.java
+++ b/tests/libs-permissions/system_ext/java/com/android/test/libs/system_ext/LibsSystemExtTest.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package com.android.test.libs.product_services;
+package com.android.test.libs.system_ext;
/**
- * Test class for product_services libs.
+ * Test class for system_ext libs.
*/
-public class LibsProductServicesTest {
+public class LibsSystemExtTest {
/**
* Dummy method for testing.