Merge "Rename sdkext module to sdkextensions"

Android.bp

@@ -265,7 +265,7 @@ filegroup {
 filegroup {
     name: "framework-updatable-sources",
     srcs: [
-        ":framework-sdkext-sources",
+        ":framework-sdkextensions-sources",
         ":framework-tethering-srcs",
         ":updatable-media-srcs",
     ]
@@ -463,7 +463,7 @@ java_library {
     static_libs: [
         "framework-minus-apex",
         "updatable_media_stubs",
-        "framework-sdkext-stubs-systemapi",
+        "framework-sdkextensions-stubs-systemapi",
         // TODO(jiyong): add more stubs for APEXes here
     ],
     sdk_version: "core_platform",

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",
+    name: "sdkextensions-sdk",
-    java_header_libs: [ "framework-sdkext-stubs-systemapi" ],
+    java_header_libs: [ "framework-sdkextensions-stubs-systemapi" ],
 }
 
 apex_key {

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;
 

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",
+    name: "framework-sdkextensions",
-    srcs: [ ":framework-sdkext-sources" ],
+    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",
+    name: "framework-sdkextensions-stubs-systemapi",
-    srcs: [":framework-sdkext-droidstubs-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
     ]
 }

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

core/jni/fd_utils.cpp

@@ -33,23 +33,23 @@
 
 // Static whitelist of open paths that the zygote is allowed to keep open.
 static const char* kPathWhitelist[] = {
-  "/apex/com.android.conscrypt/javalib/conscrypt.jar",
+        "/apex/com.android.conscrypt/javalib/conscrypt.jar",
-  "/apex/com.android.ipsec/javalib/ike.jar",
+        "/apex/com.android.ipsec/javalib/ike.jar",
-  "/apex/com.android.media/javalib/updatable-media.jar",
+        "/apex/com.android.media/javalib/updatable-media.jar",
-  "/apex/com.android.sdkext/javalib/framework-sdkext.jar",
+        "/apex/com.android.sdkext/javalib/framework-sdkextensions.jar",
-  "/apex/com.android.tethering/javalib/framework-tethering.jar",
+        "/apex/com.android.tethering/javalib/framework-tethering.jar",
-  "/dev/null",
+        "/dev/null",
-  "/dev/socket/zygote",
+        "/dev/socket/zygote",
-  "/dev/socket/zygote_secondary",
+        "/dev/socket/zygote_secondary",
-  "/dev/socket/usap_pool_primary",
+        "/dev/socket/usap_pool_primary",
-  "/dev/socket/usap_pool_secondary",
+        "/dev/socket/usap_pool_secondary",
-  "/dev/socket/webview_zygote",
+        "/dev/socket/webview_zygote",
-  "/dev/socket/heapprofd",
+        "/dev/socket/heapprofd",
-  "/sys/kernel/debug/tracing/trace_marker",
+        "/sys/kernel/debug/tracing/trace_marker",
-  "/system/framework/framework-res.apk",
+        "/system/framework/framework-res.apk",
-  "/dev/urandom",
+        "/dev/urandom",
-  "/dev/ion",
+        "/dev/ion",
-  "/dev/dri/renderD129", // Fixes b/31172436
+        "/dev/dri/renderD129", // Fixes b/31172436
 };
 
 static const char kFdPath[] = "/proc/self/fd";