[automerger skipped] [EMPTY] Add bootclasspath_fragment. am: 1b44c97c70 -s ours
am skip reason: Merged-In Idba141b6dba3c79768c63a0f16b7c584f8d71a9a with SHA-1 0a8b75953b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/14530582
Change-Id: If7abb2acde1b8212bf66c2226b12e0d8ece1bbad
diff --git a/Android.bp b/Android.bp
index 4ce6646..d694623 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,11 +20,11 @@
apex {
name: "com.android.sdkext",
defaults: [ "com.android.sdkext-defaults" ],
+ bootclasspath_fragments: ["com.android.sdkext-bootclasspath-fragment"],
binaries: [
"derive_classpath",
"derive_sdk",
],
- java_libs: [ "framework-sdkextensions" ],
prebuilts: [
"cur_sdkinfo",
"extensions_db",
@@ -60,3 +60,10 @@
name: "sdkextensions-sdk",
java_sdk_libs: ["framework-sdkextensions"],
}
+
+// Encapsulate the contributions made by the com.android.sdkext to the bootclasspath.
+bootclasspath_fragment {
+ name: "com.android.sdkext-bootclasspath-fragment",
+ contents: ["framework-sdkextensions"],
+ apex_available: ["com.android.sdkext"],
+}
diff --git a/framework/java/android/os/ext/SdkExtensions.java b/framework/java/android/os/ext/SdkExtensions.java
index f36a3f6..514daf5 100644
--- a/framework/java/android/os/ext/SdkExtensions.java
+++ b/framework/java/android/os/ext/SdkExtensions.java
@@ -43,7 +43,7 @@
public class SdkExtensions {
// S_VERSION_CODE is a separate field to simplify management across branches.
- private static final int VERSION_CODE_S = VERSION_CODES.CUR_DEVELOPMENT;
+ private static final int VERSION_CODE_S = VERSION_CODES.S;
private static final int R_EXTENSION_INT;
private static final int S_EXTENSION_INT;
private static final Map<Integer, Integer> ALL_EXTENSION_INTS;