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

Commit be72e62c authored by Anton Hansson's avatar Anton Hansson
Browse files

frameworks/base: 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
Exempt-From-Owner-Approval: Global cleanup
Change-Id: I66b515d98d03264dbb893b7c55ba7bdddfb447a1
Merged-In: I26458e41ecb84de91ac9a356a5d4bafb44f463c1
Merged-In: I938efe7a2359302cbf4d5d6f786f963044e1bbbd
Merged-In: I72ce7f1c6242ddf9a5b36075761f3f1f1138cea1
parent 4068e8e6

core/tests/BroadcastRadioTests/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ LOCAL_CERTIFICATE := platform 
LOCAL_MODULE_TAGS := tests

# TODO(b/13282254): uncomment when b/13282254 is fixed

# LOCAL_SDK_VERSION := current

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng

core/tests/overlaytests/OverlayTest/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ LOCAL_MODULE_TAGS := tests 


LOCAL_PACKAGE_NAME := OverlayTest



LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_DEX_PREOPT := false



LOCAL_JAVA_LIBRARIES += legacy-test

packages/CaptivePortalLogin/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := CaptivePortalLogin

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

packages/CarrierDefaultApp/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := CarrierDefaultApp

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform



include $(BUILD_PACKAGE)

packages/CarrierDefaultApp/tests/unit/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 
LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_PACKAGE_NAME := CarrierDefaultAppUnitTests

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_INSTRUMENTATION_FOR := CarrierDefaultApp