diff options
| author | Anton Hansson <hansson@google.com> | 2018-02-23 12:57:51 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2018-02-28 15:13:23 +0000 |
| commit | ab6ec61251786bf6b4d0407db3bc28aeefcb55db (patch) | |
| tree | fbdb5c5bd38879440eac702018dd53c0ed639541 /tests/FeatureSplit | |
| parent | 58c83fa7c8609059f3d66a5860abb302284c2981 (diff) | |
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
Change-Id: I4233b9091d9066c4fa69f3d24aaf367ea500f760
Diffstat (limited to 'tests/FeatureSplit')
| -rw-r--r-- | tests/FeatureSplit/base/Android.mk | 1 | ||||
| -rw-r--r-- | tests/FeatureSplit/feature1/Android.mk | 1 | ||||
| -rw-r--r-- | tests/FeatureSplit/feature2/Android.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/tests/FeatureSplit/base/Android.mk b/tests/FeatureSplit/base/Android.mk index 6da1b38773ed..864646030a61 100644 --- a/tests/FeatureSplit/base/Android.mk +++ b/tests/FeatureSplit/base/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FeatureSplitBase +LOCAL_SDK_VERSION := current LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_MODULE_TAGS := tests diff --git a/tests/FeatureSplit/feature1/Android.mk b/tests/FeatureSplit/feature1/Android.mk index e6ba5c2d04c9..d4d25890431e 100644 --- a/tests/FeatureSplit/feature1/Android.mk +++ b/tests/FeatureSplit/feature1/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FeatureSplit1 +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_APK_LIBRARIES := FeatureSplitBase diff --git a/tests/FeatureSplit/feature2/Android.mk b/tests/FeatureSplit/feature2/Android.mk index c8e860942fa3..5e5e78bcfff5 100644 --- a/tests/FeatureSplit/feature2/Android.mk +++ b/tests/FeatureSplit/feature2/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FeatureSplit2 +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_APK_LIBRARIES := FeatureSplitBase |