commit 4460e53c4991d63484db86f1597f78d569381d04
author Neil Fuller <nfuller@google.com> Fri Oct 12 15:03:19 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 12 15:03:19 2018 +0000
tree 5a44729069d4cd863edc50fca85d8d116cf92853
parent 73146ef4d61711c8f28b54af1723fbf3b1af0c72
parent bc1141da8e501bac6e7c10f9aa33aa0dbe8351b0

Merge "Compile against "core_current" not SDK stubs"

Android.bp

diff --git a/Android.bp b/Android.bp
index caaf02b..f137c42 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,13 +23,13 @@
         "dexmaker-dex-target",
     ],
 
-    sdk_version: "10",
+    sdk_version: "core_current",
 }
 
 // Build Dexmaker's MockMaker, a plugin to Mockito
 java_library_static {
     name: "dexmaker-mockmaker",
-    sdk_version: "10",
+    sdk_version: "core_current",
     srcs: ["dexmaker-mockito/src/main/java/**/*.java"],
     java_resource_dirs: ["dexmaker-mockito/src/main/resources"],
     libs: [
@@ -151,7 +151,7 @@
         "mockito-target-minus-junit4",
         "junit",
     ],
-    sdk_version: "16",
+    sdk_version: "core_current",
 }
 
 // Same as mockito-target but does not bundle junit
@@ -165,7 +165,7 @@
         "objenesis",
     ],
     libs: ["junit"],
-    sdk_version: "16",
+    sdk_version: "core_current",
 
     java_version: "1.7",
 }