Add libcore-platform-compat-config to art apex and sdk
Bug: 182402754
Test: m droid
Change-Id: I84b471fb18ad4374e6f8f1f554e75009ed9604d3
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 69e45a6..2951673 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -246,6 +246,7 @@
compile_multilib: "both",
manifest: "manifest-art.json",
boot_images: ["art-boot-image"],
+ compat_configs: ["libcore-platform-compat-config"],
java_libs: libcore_java_libs + art_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs +
art_runtime_base_native_device_only_shared_libs +
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp
index 553c2ba..3d18e55 100644
--- a/build/sdk/Android.bp
+++ b/build/sdk/Android.bp
@@ -87,6 +87,10 @@
"art-boot-image",
],
+ compat_configs: [
+ "libcore-platform-compat-config",
+ ],
+
// Create placeholder java_import prebuilts for the java boot libraries so that Soong
// can retrieve their dex implementation jars from the associated prebuilt_apex. All
// libraries listed in the exported_java_libs property of the ART apex (see