Merge "Rename sdkext module to sdkextensions"

20 files changed, 43 insertions, 43 deletions

diff --git a/Android.bp b/Android.bp
index bba6185739fd..0e9550a26c98 100644
--- a/Android.bp
+++ b/Android.bp
@@ -262,7 +262,7 @@ filegroup {
     name: "framework-updatable-sources",
     srcs: [
         ":framework-appsearch-sources",
-        ":framework-sdkext-sources",
+        ":framework-sdkextensions-sources",
         ":framework-statsd-sources",
         ":framework-tethering-srcs",
         ":updatable-media-srcs",
@@ -481,7 +481,7 @@ java_library {
         "updatable_media_stubs",
         "framework_mediaprovider_stubs",
         "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
-        "framework-sdkext-stubs-systemapi",
+        "framework-sdkextensions-stubs-systemapi",
         // TODO(b/146167933): Use framework-statsd-stubs instead.
         "framework-statsd",
         // TODO(b/140299412): should be framework-wifi-stubs
diff --git a/apex/sdkext/Android.bp b/apex/sdkextensions/Android.bp
index f62f167cdcfa..f3e20189639f 100644
--- a/apex/sdkext/Android.bp
+++ b/apex/sdkextensions/Android.bp
@@ -20,7 +20,7 @@ apex {
     name: "com.android.sdkext",
     manifest: "manifest.json",
     binaries: [ "derive_sdk" ],
-    java_libs: [ "framework-sdkext" ],
+    java_libs: [ "framework-sdkextensions" ],
     prebuilts: [
       "com.android.sdkext.ldconfig",
       "cur_sdkinfo",
@@ -31,8 +31,8 @@ apex {
 }
 
 sdk {
-    name: "sdkext-sdk",
-    java_header_libs: [ "framework-sdkext-stubs-systemapi" ],
+    name: "sdkextensions-sdk",
+    java_header_libs: [ "framework-sdkextensions-stubs-systemapi" ],
 }
 
 apex_key {
diff --git a/apex/sdkext/OWNERS b/apex/sdkextensions/OWNERS
index feb274262bef..feb274262bef 100644
--- a/apex/sdkext/OWNERS
+++ b/apex/sdkextensions/OWNERS
diff --git a/apex/sdkext/TEST_MAPPING b/apex/sdkextensions/TEST_MAPPING
index 91947f39980a..91947f39980a 100644
--- a/apex/sdkext/TEST_MAPPING
+++ b/apex/sdkextensions/TEST_MAPPING
diff --git a/apex/sdkext/com.android.sdkext.avbpubkey b/apex/sdkextensions/com.android.sdkext.avbpubkey
index 8f47741ed3b8..8f47741ed3b8 100644
--- a/apex/sdkext/com.android.sdkext.avbpubkey
+++ b/apex/sdkextensions/com.android.sdkext.avbpubkey
diff --git a/apex/sdkext/com.android.sdkext.pem b/apex/sdkextensions/com.android.sdkext.pem
index 816460183aa3..816460183aa3 100644
--- a/apex/sdkext/com.android.sdkext.pem
+++ b/apex/sdkextensions/com.android.sdkext.pem
diff --git a/apex/sdkext/com.android.sdkext.pk8 b/apex/sdkextensions/com.android.sdkext.pk8
index ccc0bf438cd1..ccc0bf438cd1 100644
--- a/apex/sdkext/com.android.sdkext.pk8
+++ b/apex/sdkextensions/com.android.sdkext.pk8
diff --git a/apex/sdkext/com.android.sdkext.x509.pem b/apex/sdkextensions/com.android.sdkext.x509.pem
index 45d2ade354d4..45d2ade354d4 100644
--- a/apex/sdkext/com.android.sdkext.x509.pem
+++ b/apex/sdkextensions/com.android.sdkext.x509.pem
diff --git a/apex/sdkext/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp
index c4e3c296f210..c4e3c296f210 100644
--- a/apex/sdkext/derive_sdk/Android.bp
+++ b/apex/sdkextensions/derive_sdk/Android.bp
diff --git a/apex/sdkext/derive_sdk/derive_sdk.cpp b/apex/sdkextensions/derive_sdk/derive_sdk.cpp
index 0a9711677015..6fb7ef43416e 100644
--- a/apex/sdkext/derive_sdk/derive_sdk.cpp
+++ b/apex/sdkextensions/derive_sdk/derive_sdk.cpp
@@ -26,7 +26,7 @@
 #include <android-base/logging.h>
 #include <android-base/properties.h>
 
-#include "frameworks/base/apex/sdkext/derive_sdk/sdk.pb.h"
+#include "frameworks/base/apex/sdkextensions/derive_sdk/sdk.pb.h"
 
 using com::android::sdkext::proto::SdkVersion;
 
diff --git a/apex/sdkext/derive_sdk/derive_sdk.rc b/apex/sdkextensions/derive_sdk/derive_sdk.rc
index 1b667949eeaa..1b667949eeaa 100644
--- a/apex/sdkext/derive_sdk/derive_sdk.rc
+++ b/apex/sdkextensions/derive_sdk/derive_sdk.rc
diff --git a/apex/sdkext/derive_sdk/sdk.proto b/apex/sdkextensions/derive_sdk/sdk.proto
index d15b93552ff4..d15b93552ff4 100644
--- a/apex/sdkext/derive_sdk/sdk.proto
+++ b/apex/sdkextensions/derive_sdk/sdk.proto
diff --git a/apex/sdkext/framework/Android.bp b/apex/sdkextensions/framework/Android.bp
index a50dc3d4f349..2845612934b6 100644
--- a/apex/sdkext/framework/Android.bp
+++ b/apex/sdkextensions/framework/Android.bp
@@ -17,7 +17,7 @@ package {
 }
 
 filegroup {
-    name: "framework-sdkext-sources",
+    name: "framework-sdkextensions-sources",
     srcs: [
         "java/**/*.java",
     ],
@@ -26,46 +26,46 @@ filegroup {
 }
 
 java_library {
-    name: "framework-sdkext",
-    srcs: [ ":framework-sdkext-sources" ],
+    name: "framework-sdkextensions",
+    srcs: [ ":framework-sdkextensions-sources" ],
     sdk_version: "system_current",
     libs: [ "framework-annotations-lib" ],
     permitted_packages: [ "android.os.ext" ],
     installable: true,
-    visibility: [ "//frameworks/base/apex/sdkext:__pkg__" ],
+    visibility: [ "//frameworks/base/apex/sdkextensions:__pkg__" ],
 }
 
 droidstubs {
-    name: "framework-sdkext-droidstubs-publicapi",
+    name: "framework-sdkextensions-droidstubs-publicapi",
     defaults: [
-        "framework-sdkext-stubs-defaults",
+        "framework-sdkextensions-stubs-defaults",
         "framework-module-stubs-defaults-publicapi",
     ]
 }
 
 droidstubs {
-    name: "framework-sdkext-droidstubs-systemapi",
+    name: "framework-sdkextensions-droidstubs-systemapi",
     defaults: [
-        "framework-sdkext-stubs-defaults",
+        "framework-sdkextensions-stubs-defaults",
         "framework-module-stubs-defaults-systemapi",
     ]
 }
 
 stubs_defaults {
-    name: "framework-sdkext-stubs-defaults",
+    name: "framework-sdkextensions-stubs-defaults",
     srcs: [
-        ":framework-sdkext-sources",
+        ":framework-sdkextensions-sources",
         ":framework-annotations",
     ],
     sdk_version: "system_current",
 }
 
 java_library {
-    name: "framework-sdkext-stubs-systemapi",
-    srcs: [":framework-sdkext-droidstubs-systemapi"],
+    name: "framework-sdkextensions-stubs-systemapi",
+    srcs: [":framework-sdkextensions-droidstubs-systemapi"],
     sdk_version: "system_current",
     visibility: [
       "//frameworks/base:__pkg__", // Framework
-      "//frameworks/base/apex/sdkext:__pkg__", // sdkext SDK
+      "//frameworks/base/apex/sdkextensions:__pkg__", // sdkextensions SDK
     ]
 }
diff --git a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java b/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java
index a8a7effa9b6c..a8a7effa9b6c 100644
--- a/apex/sdkext/framework/java/android/os/ext/SdkExtensions.java
+++ b/apex/sdkextensions/framework/java/android/os/ext/SdkExtensions.java
diff --git a/apex/sdkext/framework/java/android/os/ext/package.html b/apex/sdkextensions/framework/java/android/os/ext/package.html
index 34c1697c01fd..34c1697c01fd 100644
--- a/apex/sdkext/framework/java/android/os/ext/package.html
+++ b/apex/sdkextensions/framework/java/android/os/ext/package.html
diff --git a/apex/sdkext/gen_sdkinfo.py b/apex/sdkextensions/gen_sdkinfo.py
index 5af478ba7fe6..5af478ba7fe6 100644
--- a/apex/sdkext/gen_sdkinfo.py
+++ b/apex/sdkextensions/gen_sdkinfo.py
diff --git a/apex/sdkext/ld.config.txt b/apex/sdkextensions/ld.config.txt
index b4470685f4fc..dcc69b892760 100644
--- a/apex/sdkext/ld.config.txt
+++ b/apex/sdkextensions/ld.config.txt
@@ -1,10 +1,10 @@
 # Copyright (C) 2019 The Android Open Source Project
 #
-# Bionic loader config file for the sdkext apex.
+# Bionic loader config file for the sdkextensions apex.
 
-dir.sdkext = /apex/com.android.sdkext/bin/
+dir.sdkextensions = /apex/com.android.sdkext/bin/
 
-[sdkext]
+[sdkextensions]
 additional.namespaces = platform
 
 namespace.default.isolated = true
diff --git a/apex/sdkext/manifest.json b/apex/sdkextensions/manifest.json
index 048f5c4f177b..048f5c4f177b 100644
--- a/apex/sdkext/manifest.json
+++ b/apex/sdkextensions/manifest.json
diff --git a/apex/sdkext/sdk.proto b/apex/sdkextensions/sdk.proto
index d15b93552ff4..d15b93552ff4 100644
--- a/apex/sdkext/sdk.proto
+++ b/apex/sdkextensions/sdk.proto
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index 5624f457a9b2..082a2892e34b 100644
--- a/core/jni/fd_utils.cpp
+++ b/core/jni/fd_utils.cpp
@@ -33,27 +33,27 @@
 
 // Static whitelist of open paths that the zygote is allowed to keep open.
 static const char* kPathWhitelist[] = {
-  "/apex/com.android.appsearch/javalib/framework-appsearch.jar",
-  "/apex/com.android.conscrypt/javalib/conscrypt.jar",
-  "/apex/com.android.ipsec/javalib/ike.jar",
-  "/apex/com.android.media/javalib/updatable-media.jar",
-  "/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar",
-  "/apex/com.android.os.statsd/javalib/framework-statsd.jar",
-  "/apex/com.android.sdkext/javalib/framework-sdkext.jar",
-  "/apex/com.android.wifi/javalib/framework-wifi.jar",
-  "/apex/com.android.tethering/javalib/framework-tethering.jar",
-  "/dev/null",
-  "/dev/socket/zygote",
-  "/dev/socket/zygote_secondary",
-  "/dev/socket/usap_pool_primary",
-  "/dev/socket/usap_pool_secondary",
-  "/dev/socket/webview_zygote",
-  "/dev/socket/heapprofd",
-  "/sys/kernel/debug/tracing/trace_marker",
-  "/system/framework/framework-res.apk",
-  "/dev/urandom",
-  "/dev/ion",
-  "/dev/dri/renderD129", // Fixes b/31172436
+        "/apex/com.android.appsearch/javalib/framework-appsearch.jar",
+        "/apex/com.android.conscrypt/javalib/conscrypt.jar",
+        "/apex/com.android.ipsec/javalib/ike.jar",
+        "/apex/com.android.media/javalib/updatable-media.jar",
+        "/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar",
+        "/apex/com.android.os.statsd/javalib/framework-statsd.jar",
+        "/apex/com.android.sdkext/javalib/framework-sdkextensions.jar",
+        "/apex/com.android.wifi/javalib/framework-wifi.jar",
+        "/apex/com.android.tethering/javalib/framework-tethering.jar",
+        "/dev/null",
+        "/dev/socket/zygote",
+        "/dev/socket/zygote_secondary",
+        "/dev/socket/usap_pool_primary",
+        "/dev/socket/usap_pool_secondary",
+        "/dev/socket/webview_zygote",
+        "/dev/socket/heapprofd",
+        "/sys/kernel/debug/tracing/trace_marker",
+        "/system/framework/framework-res.apk",
+        "/dev/urandom",
+        "/dev/ion",
+        "/dev/dri/renderD129", // Fixes b/31172436
 };
 
 static const char kFdPath[] = "/proc/self/fd";