Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9201863b authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent cc7c12d0

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

app-perf-tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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) \

perf-tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

tests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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