aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2018-03-09 22:40:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-09 22:40:06 +0000
commit13a170060756ad88141e7ee740afd35f29e765a9 (patch)
tree308f9979f2ea7bc08fed5ee43022c3ec51e75688
parentd7d7224871594ee626d6d0cbc91f16d64536be99 (diff)
parentcbcf969a038b3ed9eb5c297ec30bc0b62436ab03 (diff)
downloadrappor-13a170060756ad88141e7ee740afd35f29e765a9.tar.gz
Build rappor with SDK am: f39153c363
am: cbcf969a03 Change-Id: I2fea43815df79bca4b998af6812234fd5bd39f2a
-rw-r--r--Android.bp2
-rw-r--r--Android.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 7cefad1..db6d520 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,8 +18,8 @@ java_library_static {
name: "rappor",
no_framework_libs: true,
java_version: "1.7",
+ sdk_version: "core_current",
libs: [
- "core-oj",
"jsr305",
],
srcs: ["client/java/**/*.java"],
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)