commit 5df5944856133416c390c2032c6cde5a3e708a7b
author Paul Duffin <paulduffin@google.com> Fri Jan 31 18:20:23 2020 +0000
committer Paul Duffin <paulduffin@google.com> Fri Jan 31 18:20:23 2020 +0000
tree 8ed2ef845c32346d7f7e42d26a493a60fb0e7211
parent b189fadb3802eb29f78602fd2899baf061ca4b42

Expose system and test stubs from java_sdk_library_import

Bug: 148080325
Test: m droid
      TARGET_BUILD_APPS=Camera2 m

Change-Id: Iac2047e6c8a862354c90392d3bd07b9f9f5d15c5

current/Android.bp

diff --git a/current/Android.bp b/current/Android.bp
index 45a7b78..bb8b580 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,13 +1,33 @@
 java_sdk_library_import {
     name: "android.test.base",
-    jars: ["public/android.test.base.jar"],
-    sdk_version: "current",
+    public: {
+        jars: ["public/android.test.base.jar"],
+        sdk_version: "current",
+    },
+    system: {
+        jars: ["system/android.test.base.jar"],
+        sdk_version: "system_current",
+    },
+    test: {
+        jars: ["test/android.test.base.jar"],
+        sdk_version: "test_current",
+    },
 }
 
 java_sdk_library_import {
     name: "android.test.runner",
-    jars: ["public/android.test.runner.jar"],
-    sdk_version: "current",
+    public: {
+        jars: ["public/android.test.runner.jar"],
+        sdk_version: "current",
+    },
+    system: {
+        jars: ["system/android.test.runner.jar"],
+        sdk_version: "system_current",
+    },
+    test: {
+        jars: ["test/android.test.runner.jar"],
+        sdk_version: "test_current",
+    },
     libs: [
         "android.test.base",
         "android.test.mock",
@@ -16,14 +36,34 @@
 
 java_sdk_library_import {
     name: "android.test.mock",
-    jars: ["public/android.test.mock.jar"],
-    sdk_version: "current",
+    public: {
+        jars: ["public/android.test.mock.jar"],
+        sdk_version: "current",
+    },
+    system: {
+        jars: ["system/android.test.mock.jar"],
+        sdk_version: "system_current",
+    },
+    test: {
+        jars: ["test/android.test.mock.jar"],
+        sdk_version: "test_current",
+    },
 }
 
 java_sdk_library_import {
     name: "org.apache.http.legacy",
-    jars: ["public/org.apache.http.legacy.jar"],
-    sdk_version: "current",
+    public: {
+        jars: ["public/org.apache.http.legacy.jar"],
+        sdk_version: "current",
+    },
+    system: {
+        jars: ["system/org.apache.http.legacy.jar"],
+        sdk_version: "system_current",
+    },
+    test: {
+        jars: ["test/org.apache.http.legacy.jar"],
+        sdk_version: "test_current",
+    },
 }
 
 java_import {