summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pedro Loureiro <pedroql@google.com> 2021-12-22 19:42:44 +0000
committer Pedro Loureiro <pedroql@google.com> 2021-12-22 19:42:44 +0000
commitc2d3032e884e775837fe43480900c80c6a83426d (patch)
tree242b0e0c419261c14a1d8ebdb814bfdc53b28f82
parent52e1f3676369daeed6fadc539e4bd8830238e91d (diff)
Rename updatable-library to apex-library
Mostly for consistency with the names used in related changes. Test: atest com.android.server.pm.parsing.library.ApexSharedLibraryUpdaterTest com.android.server.systemconfig.SystemConfigTest Bug: 191978330 Change-Id: Ic4ccc0fdca100b576e28bc0918d378cabae9ce61
-rw-r--r--core/java/com/android/server/SystemConfig.java4
-rw-r--r--services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index d66f4614e0e8..39f17e510a1c 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -849,8 +849,8 @@ public class SystemConfig {
XmlUtils.skipCurrentTag(parser);
}
} break;
- case "updatable-library":
- // "updatable-library" is meant to behave exactly like "library"
+ case "apex-library":
+ // "apex-library" is meant to behave exactly like "library"
case "library": {
if (allowLibs) {
String lname = parser.getAttributeValue(null, "name");
diff --git a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java
index add4cdaa28ce..eeaf781dd307 100644
--- a/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java
+++ b/services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java
@@ -357,13 +357,13 @@ public class SystemConfigTest {
/**
* Tests that readPermissions works correctly for a library using the new
- * {@code updatable-library} tag.
+ * {@code apex-library} tag.
*/
@Test
public void readPermissions_allowLibs_parsesUpdatableLibrary() throws IOException {
String contents =
"<permissions>\n"
- + " <updatable-library \n"
+ + " <apex-library \n"
+ " name=\"foo\"\n"
+ " file=\"" + mFooJar + "\"\n"
+ " on-bootclasspath-before=\"10\"\n"