Add missing java_sdk_library_imports for current/*.jar
The prebuilt versions of various libraries relied on logic in the
java_sdk_library module to make them available for unbundled builds.
That logic is being moved into java_sdk_library_import and so it
requires a java_sdk_library_import to be defined for each of the
libraries.
Note, not every jar that is present in the public/system/test
directory is a java_sdk_library.
Bug: 148080325
Test: m droid && TARGET_BUILD_APPS=Camera2 m
Change-Id: I14140e46248da058367201175eace69fcb670260
diff --git a/current/Android.bp b/current/Android.bp
index bb8b580..e63c4b2 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -51,6 +51,118 @@
}
java_sdk_library_import {
+ name: "com.android.future.usb.accessory",
+ public: {
+ jars: ["public/com.android.future.usb.accessory.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/com.android.future.usb.accessory.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/com.android.future.usb.accessory.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "com.android.location.provider",
+ public: {
+ jars: ["public/com.android.location.provider.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/com.android.location.provider.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/com.android.location.provider.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "com.android.mediadrm.signer",
+ public: {
+ jars: ["public/com.android.mediadrm.signer.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/com.android.mediadrm.signer.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/com.android.mediadrm.signer.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "com.android.media.remotedisplay",
+ public: {
+ jars: ["public/com.android.media.remotedisplay.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/com.android.media.remotedisplay.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/com.android.media.remotedisplay.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "com.android.media.tv.remoteprovider",
+ public: {
+ jars: ["public/com.android.media.tv.remoteprovider.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/com.android.media.tv.remoteprovider.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/com.android.media.tv.remoteprovider.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "com.android.nfc_extras",
+ public: {
+ jars: ["public/com.android.nfc_extras.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/com.android.nfc_extras.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/com.android.nfc_extras.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "javax.obex",
+ public: {
+ jars: ["public/javax.obex.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/javax.obex.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/javax.obex.jar"],
+ sdk_version: "test_current",
+ },
+}
+
+java_sdk_library_import {
name: "org.apache.http.legacy",
public: {
jars: ["public/org.apache.http.legacy.jar"],
@@ -66,6 +178,22 @@
},
}
+java_sdk_library_import {
+ name: "SurfaceFlingerProperties",
+ public: {
+ jars: ["public/SurfaceFlingerProperties.jar"],
+ sdk_version: "current",
+ },
+ system: {
+ jars: ["system/SurfaceFlingerProperties.jar"],
+ sdk_version: "system_current",
+ },
+ test: {
+ jars: ["test/SurfaceFlingerProperties.jar"],
+ sdk_version: "test_current",
+ },
+}
+
java_import {
name: "android-support-multidex-instrumentation",
jars: ["multidex/instrumentation/android-support-multidex-instrumentation.jar"],
