1 files changed, 16 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 6f9f7cb95..84b10229b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -506,7 +506,7 @@ java_library_host {
 java_library_static {
     name: "libprotobuf-java-lite",
     host_supported: true,
-    no_framework_libs: true,
+    sdk_version: "core_current",
 
     srcs: [
         "java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java",
@@ -550,6 +550,12 @@ java_library_static {
         "java/core/src/main/java/com/google/protobuf/WireFormat.java",
     ],
 
+    target: {
+        android: {
+            libs: ["libcore_private.stubs"],
+        },
+    },
+
     java_version: "1.7",
 }
 
@@ -581,3 +587,12 @@ java_library_host {
     name: "host-libprotobuf-java-full",
     static_libs: ["libprotobuf-java-full"],
 }
+
+// Stubs library for using hidden APIs in core-oj and core-libart
+// =======================================================
+java_library {
+    name: "libcore_private.stubs",
+    srcs: ["java/core/src/stubs/**/*.java"],
+    sdk_version: "core_current",
+    installable: false,
+}