diff options
author | 2018-02-22 16:11:48 +0000 | |
---|---|---|
committer | 2018-02-23 16:44:40 +0000 | |
commit | 9201863b712d7aac1a0085c2138990d04e4fbdb7 (patch) | |
tree | 83775e302a010e4e27e49277fd294bcc775435f8 | |
parent | cc7c12d0bae8ddef53ec469d50bda6a9cd48d83d (diff) |
packages/apps/DocumentsUI: Set LOCAL_SDK_VERSION where possible.
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: Ia8cb832ecb40050a5573959dab15e2deec0fb4c0
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | app-perf-tests/Android.mk | 1 | ||||
-rw-r--r-- | perf-tests/Android.mk | 1 | ||||
-rw-r--r-- | tests/Android.mk | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 50a168b25..a0b633adb 100644 --- a/Android.mk +++ b/Android.mk @@ -7,6 +7,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := DocumentsUI +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml @@ -33,6 +34,7 @@ LOCAL_SRC_FILES := \ src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java LOCAL_PACKAGE_NAME := DocumentsUIMinimal +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/minimal/res LOCAL_FULL_MANIFEST_FILE := $(LOCAL_PATH)/minimal/AndroidManifest.xml diff --git a/app-perf-tests/Android.mk b/app-perf-tests/Android.mk index 4db20a7bb..76af3c58e 100644 --- a/app-perf-tests/Android.mk +++ b/app-perf-tests/Android.mk @@ -3,6 +3,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests #LOCAL_SDK_VERSION := current +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) \ diff --git a/perf-tests/Android.mk b/perf-tests/Android.mk index 0f4696631..731a8fa06 100644 --- a/perf-tests/Android.mk +++ b/perf-tests/Android.mk @@ -18,6 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := DocumentsUIPerfTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := DocumentsUI LOCAL_CERTIFICATE := platform diff --git a/tests/Android.mk b/tests/Android.mk index 1dd259bd2..143e6857d 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -20,6 +20,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ guava LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_PACKAGE_NAME := DocumentsUITests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_INSTRUMENTATION_FOR := DocumentsUI LOCAL_CERTIFICATE := platform |