summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2018-02-22 16:12:43 +0000
committerAnton Hansson <hansson@google.com>2018-02-22 16:12:43 +0000
commitcb14010e3a9eb9cda736c164d15118c1d0d20274 (patch)
treebe350d5bf9676ca2f2ef6db565a975304ae02432
parentb2352f8e937e01fd4ade629d5186397d676f67df (diff)
downloadplatform_packages_apps_Test_connectivity-cb14010e3a9eb9cda736c164d15118c1d0d20274.tar.gz
platform_packages_apps_Test_connectivity-cb14010e3a9eb9cda736c164d15118c1d0d20274.tar.bz2
platform_packages_apps_Test_connectivity-cb14010e3a9eb9cda736c164d15118c1d0d20274.zip
packages/apps/Test/connectivity: Set LOCAL_SDK_VERSION where possible.android-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7
This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Ic5f28ae67fdb7c8ceb1224588621a72fef439e60
-rw-r--r--PMC/Android.mk1
-rw-r--r--UID/Android.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/PMC/Android.mk b/PMC/Android.mk
index fcd25bd..d868e1d 100644
--- a/PMC/Android.mk
+++ b/PMC/Android.mk
@@ -5,6 +5,7 @@ LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
LOCAL_PACKAGE_NAME := PMC
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_DEX_PREOPT := false
diff --git a/UID/Android.mk b/UID/Android.mk
index 19851f6..6a83b1d 100644
--- a/UID/Android.mk
+++ b/UID/Android.mk
@@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := ConnectivityUIDTest
+LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_DEX_PREOPT := false