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

Commit 250e9629 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible." 

am: 13310fef

Change-Id: Idbd6c7575b15c68a34c75ae6e5a5dd5418cfab82
parents e8cb4f40 13310fef

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