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

Commit a42bfa83 authored by hansson's avatar hansson Committed by android-build-merger
Browse files

Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible." am: f5b75dd7 am: aa0812f4 

am: 685b923a

Change-Id: I39a6aad6f8bf21741de4feb838694ab43dc5d074
parents 41baba14 685b923a

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_PACKAGE_NAME := Settings

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_CERTIFICATE := platform

LOCAL_PRIVILEGED_MODULE := true

LOCAL_MODULE_TAGS := optional

tests/anomaly-tester/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) 
LOCAL_PROGUARD_ENABLED := disabled



LOCAL_PACKAGE_NAME := AnomalyTester

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_INSTRUMENTATION_FOR := Settings

tests/unit/Android.mk

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



LOCAL_PACKAGE_NAME := SettingsUnitTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_COMPATIBILITY_SUITE := device-tests



LOCAL_INSTRUMENTATION_FOR := Settings