From 861554a2d94b122a1128e895083d463747ce0981 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 22 Feb 2018 16:12:29 +0000 Subject: [PATCH] packages/apps/Settings: 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: Ic906adbd670c4dbfe2cdf0b71cdbeaf9ac08a27e --- Android.mk | 1 + tests/anomaly-tester/Android.mk | 1 + tests/unit/Android.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/Android.mk b/Android.mk index c59d938f31..cb856cec23 100644 --- a/Android.mk +++ b/Android.mk @@ -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 diff --git a/tests/anomaly-tester/Android.mk b/tests/anomaly-tester/Android.mk index ade37db028..5d48ca89bb 100644 --- a/tests/anomaly-tester/Android.mk +++ b/tests/anomaly-tester/Android.mk @@ -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 diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk index 060c3e11bc..ca7b1cdb00 100644 --- a/tests/unit/Android.mk +++ b/tests/unit/Android.mk @@ -20,6 +20,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 -- 2.11.0