Snap for 9241468 from c1908976f9e9673aa85a784d234289392d332c22 to mainline-wifi-release
Change-Id: I60e0cbb29362e1a0f13bf73a5b718f32fd07c2e1
diff --git a/Android.bp b/Android.bp
index cb98854..6f3becf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -528,12 +528,18 @@
// Unbundled Conscrypt jar for use by signapk and apksigner tool
//
// Builds against standard host libraries.
-java_library_host {
+//
+// This does not use java_library_host as that does not support the
+// min_sdk_version property which needs to be set to make sure that this
+// library is added to the sdk snapshot correctly.
+java_library {
name: "conscrypt-unbundled",
visibility: [
"//build/make/tools/signapk",
"//tools/apksig",
],
+ device_supported: false,
+ host_supported: true,
srcs: [
"common/src/main/java/**/*.java",
"openjdk/src/main/java/**/*.java",
@@ -546,6 +552,8 @@
enabled: true,
},
},
+ // Make sure that this will be added to the sdk snapshot for S.
+ min_sdk_version: "S",
}
// Static unbundled Conscrypt crypto JNI library
diff --git a/apex/Android.bp b/apex/Android.bp
index 86e48f9..c516f77 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -40,13 +40,13 @@
// Whether it actually will be compressed is controlled on per-device basis.
compressible: true,
- // IMPORTANT: q-launched-apex-module enables the build system to make
+ // IMPORTANT: q-launched-dcla-enabled-apex-module enables the build system to make
// sure the package compatible to Android 10 in two ways:
// - build the APEX package compatible to Android 10
// so that the package can be installed.
// - build artifacts (lib/javalib/bin) against Android 10 SDK
// so that the artifacts can run.
- defaults: ["q-launched-apex-module"],
+ defaults: ["q-launched-dcla-enabled-apex-module"],
}
filegroup {
