summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2018-02-23 18:36:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-23 18:36:51 +0000
commitac8bb2648d0dd4337f08cad07d89a43f2921d1c3 (patch)
treeae84ddc9e51649f1021fb64e671c73db32b5fc19
parentfd2b16a0ebcee4b0810c8051b2cd22cfa99f8ba0 (diff)
parente2183c2f7e1699bb433d353d3229c2b070d678c2 (diff)
downloadPartnerBookmarksProvider-ac8bb2648d0dd4337f08cad07d89a43f2921d1c3.tar.gz
Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where possible." am: 6a41008120
am: e2183c2f7e Change-Id: I905adcdce4725aa352660e02fd7c501b16901ded
-rw-r--r--Android.mk1
-rw-r--r--tests/Android.mk3
2 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 6978cfa..100cfcb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := PartnerBookmarksProvider
+LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)
diff --git a/tests/Android.mk b/tests/Android.mk
index b509e96..8a107c7 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -23,8 +23,9 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := PartnerBookmarksProviderTest
+LOCAL_SDK_VERSION := current
-LOCAL_JAVA_LIBRARIES := ext legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := junit
LOCAL_INSTRUMENTATION_FOR := PartnerBookmarksProvider