commit 6910307139d1d764b28e26824381a2d4942a9307
author android-build-team Robot <android-build-team-robot@google.com> Sun Mar 11 08:26:15 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Mar 11 08:26:15 2018 +0000
tree 308f9979f2ea7bc08fed5ee43022c3ec51e75688
parent 8e15ed6a9bdeda6478fd2c6329c7e739bdbe828f
parent f39153c36334050135aef8db359b2cbc98ef1248

Snap for 4647811 from f39153c36334050135aef8db359b2cbc98ef1248 to pi-release

Change-Id: I01219011d797fd542efec60406e1c7dc0ccc8ff9

Android.bp

diff --git a/Android.bp b/Android.bp
index 7cefad1..db6d520 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,8 +18,8 @@
     name: "rappor",
     no_framework_libs: true,
     java_version: "1.7",
+    sdk_version: "core_current",
     libs: [
-        "core-oj",
         "jsr305",
     ],
     srcs: ["client/java/**/*.java"],

Android.mk

diff --git a/Android.mk b/Android.mk
index 948d2f5..1fb2caf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,9 +17,9 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE := rappor-tests
-LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-library rappor guava junit
-LOCAL_JAVA_LIBRARIES := core-oj jsr305
+LOCAL_JAVA_LIBRARIES := jsr305
+LOCAL_SDK_VERISON := core_current
 LOCAL_SRC_FILES := $(call all-java-files-under, client/javatest)
 include $(BUILD_STATIC_JAVA_LIBRARY)