Merge "packages/apps/KeyChain: Set LOCAL_SDK_VERSION where possible."
am: 2c7fb841f5

Change-Id: I250175e72046303424a64c9623b04302bb954c6b
diff --git a/Android.mk b/Android.mk
index 135fbbb..0fcd4a5 100755
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,7 @@
 LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt
 
 LOCAL_PACKAGE_NAME := KeyChain
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/support/Android.mk b/support/Android.mk
index 5a75dd4..0160ab9 100644
--- a/support/Android.mk
+++ b/support/Android.mk
@@ -24,6 +24,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := KeyChainTestsSupport
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_STATIC_JAVA_LIBRARIES := com.android.keychain.tests.support junit
 LOCAL_CERTIFICATE := platform
 include $(BUILD_PACKAGE)
diff --git a/tests/Android.mk b/tests/Android.mk
index d4528a9..6b14259 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,6 +18,7 @@
 LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_PACKAGE_NAME := KeyChainTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_STATIC_JAVA_LIBRARIES := \
     com.android.keychain.tests.support \
     core-tests-support \