Build android.test.runner and its variants with SDK

They are not using any private APIs, thus eligible to be built with SDK.

Test: m -j
Change-Id: I82c7e2a739a40d6d2f1488164b25503a8a454b0d

diff --git a/test-runner/Android.bp b/test-runner/Android.bp
index a2edb04..c69279b 100644 (file)
--- a/test-runner/Android.bp
+++ b/test-runner/Android.bp
@@ -27,9 +27,8 @@ java_library {
       javacflags: ["-Xep:DepAnn:ERROR"],
     },
 
-    no_framework_libs: true,
+    sdk_version: "current",
     libs: [
-        "framework",
         "android.test.base",
         "android.test.mock",
     ],
@@ -44,9 +43,8 @@ java_library {
 
     srcs: ["src/android/**/*.java"],
 
-    no_framework_libs: true,
+    sdk_version: "current",
     libs: [
-        "framework",
         "android.test.base",
         "android.test.mock",
         "junit",
@@ -58,6 +56,7 @@ java_library {
 java_library_static {
     name: "repackaged.android.test.runner",
 
+    sdk_version: "current",
     static_libs: ["android.test.runner"],
 
     jarjar_rules: "jarjar-rules.txt",