Merge "Rename sdkext module to sdkextensions"
diff --git a/Android.bp b/Android.bp
index 27f22bd..f776bcd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -265,7 +265,7 @@
filegroup {
name: "framework-updatable-sources",
srcs: [
- ":framework-sdkext-sources",
+ ":framework-sdkextensions-sources",
":framework-tethering-srcs",
":updatable-media-srcs",
]
@@ -463,7 +463,7 @@
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",
diff --git a/apex/sdkext/Android.bp b/apex/sdkextensions/Android.bp
similarity index 92%
rename from apex/sdkext/Android.bp
rename to apex/sdkextensions/Android.bp
index f62f167..f3e2018 100644
--- a/apex/sdkext/Android.bp
+++ b/apex/sdkextensions/Android.bp
@@ -20,7 +20,7 @@
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 @@
}
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
similarity index 100%
rename from apex/sdkext/OWNERS
rename to apex/sdkextensions/OWNERS
diff --git a/apex/sdkext/TEST_MAPPING b/apex/sdkextensions/TEST_MAPPING
similarity index 100%
rename from apex/sdkext/TEST_MAPPING
rename to apex/sdkextensions/TEST_MAPPING
diff --git a/apex/sdkext/com.android.sdkext.avbpubkey b/apex/sdkextensions/com.android.sdkext.avbpubkey
similarity index 100%
rename from apex/sdkext/com.android.sdkext.avbpubkey
rename to apex/sdkextensions/com.android.sdkext.avbpubkey
Binary files differ
diff --git a/apex/sdkext/com.android.sdkext.pem b/apex/sdkextensions/com.android.sdkext.pem
similarity index 100%
rename from apex/sdkext/com.android.sdkext.pem
rename to apex/sdkextensions/com.android.sdkext.pem
diff --git a/apex/sdkext/com.android.sdkext.pk8 b/apex/sdkextensions/com.android.sdkext.pk8
similarity index 100%
rename from apex/sdkext/com.android.sdkext.pk8
rename to apex/sdkextensions/com.android.sdkext.pk8
Binary files differ
diff --git a/apex/sdkext/com.android.sdkext.x509.pem b/apex/sdkextensions/com.android.sdkext.x509.pem
similarity index 100%
rename from apex/sdkext/com.android.sdkext.x509.pem
rename to apex/sdkextensions/com.android.sdkext.x509.pem
diff --git a/apex/sdkext/derive_sdk/Android.bp b/apex/sdkextensions/derive_sdk/Android.bp
similarity index 100%
rename from apex/sdkext/derive_sdk/Android.bp
rename to apex/sdkextensions/derive_sdk/Android.bp
diff --git a/apex/sdkext/derive_sdk/derive_sdk.cpp b/apex/sdkextensions/derive_sdk/derive_sdk.cpp
similarity index 97%
rename from apex/sdkext/derive_sdk/derive_sdk.cpp
rename to apex/sdkextensions/derive_sdk/derive_sdk.cpp
index 0a97116..6fb7ef4 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
similarity index 100%
rename from apex/sdkext/derive_sdk/derive_sdk.rc
rename to apex/sdkextensions/derive_sdk/derive_sdk.rc
diff --git a/apex/sdkext/derive_sdk/sdk.proto b/apex/sdkextensions/derive_sdk/sdk.proto
similarity index 100%
rename from apex/sdkext/derive_sdk/sdk.proto
rename to apex/sdkextensions/derive_sdk/sdk.proto
diff --git a/apex/sdkext/framework/Android.bp b/apex/sdkextensions/framework/Android.bp
similarity index 66%
rename from apex/sdkext/framework/Android.bp
rename to apex/sdkextensions/framework/Android.bp
index a50dc3d..2845612 100644
--- a/apex/sdkext/framework/Android.bp
+++ b/apex/sdkextensions/framework/Android.bp
@@ -17,7 +17,7 @@
}
filegroup {
- name: "framework-sdkext-sources",
+ name: "framework-sdkextensions-sources",
srcs: [
"java/**/*.java",
],
@@ -26,46 +26,46 @@
}
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
similarity index 100%
rename from apex/sdkext/framework/java/android/os/ext/SdkExtensions.java
rename to 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
similarity index 100%
rename from apex/sdkext/framework/java/android/os/ext/package.html
rename to apex/sdkextensions/framework/java/android/os/ext/package.html
diff --git a/apex/sdkext/gen_sdkinfo.py b/apex/sdkextensions/gen_sdkinfo.py
similarity index 100%
rename from apex/sdkext/gen_sdkinfo.py
rename to apex/sdkextensions/gen_sdkinfo.py
diff --git a/apex/sdkext/ld.config.txt b/apex/sdkextensions/ld.config.txt
similarity index 91%
rename from apex/sdkext/ld.config.txt
rename to apex/sdkextensions/ld.config.txt
index b447068..dcc69b8 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
similarity index 100%
rename from apex/sdkext/manifest.json
rename to apex/sdkextensions/manifest.json
diff --git a/apex/sdkext/sdk.proto b/apex/sdkextensions/sdk.proto
similarity index 100%
rename from apex/sdkext/sdk.proto
rename to apex/sdkextensions/sdk.proto
diff --git a/core/jni/fd_utils.cpp b/core/jni/fd_utils.cpp
index ee74f6d..1b6d622 100644
--- a/core/jni/fd_utils.cpp
+++ b/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.ipsec/javalib/ike.jar",
- "/apex/com.android.media/javalib/updatable-media.jar",
- "/apex/com.android.sdkext/javalib/framework-sdkext.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.conscrypt/javalib/conscrypt.jar",
+ "/apex/com.android.ipsec/javalib/ike.jar",
+ "/apex/com.android.media/javalib/updatable-media.jar",
+ "/apex/com.android.sdkext/javalib/framework-sdkextensions.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";