Merge "development: Set LOCAL_SDK_VERSION where possible."

2018-02-26 16:24:58 +00:00
parent 60d31dd2f3 44b2e0dfcb
commit 76ce83e999
10 changed files with 10 additions and 0 deletions
--- a/apps/BluetoothDebug/Android.mk
+++ b/apps/BluetoothDebug/Android.mk
@@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_JAVA_LIBRARIES :=

 LOCAL_PACKAGE_NAME := BluetoothDebug
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform

 LOCAL_PROGUARD_ENABLED := disabled
--- a/apps/CustomLocale/Android.mk
+++ b/apps/CustomLocale/Android.mk
@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-subdir-java-files)

 LOCAL_PACKAGE_NAME := CustomLocale
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform

 include $(BUILD_PACKAGE)
--- a/apps/Development/Android.mk
+++ b/apps/Development/Android.mk
@@ -9,6 +9,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
                src/com/android/development/IRemoteService.aidl \

 LOCAL_PACKAGE_NAME := Development
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform

 include $(BUILD_PACKAGE)
--- a/apps/DevelopmentSettings/Android.mk
+++ b/apps/DevelopmentSettings/Android.mk
@@ -2,5 +2,6 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)

 LOCAL_PACKAGE_NAME := DevelopmentSettings
+LOCAL_SDK_VERSION := current

 include $(BUILD_PACKAGE)
--- a/apps/Fallback/Android.mk
+++ b/apps/Fallback/Android.mk
@@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-subdir-java-files)

 LOCAL_PACKAGE_NAME := Fallback
+LOCAL_SDK_VERSION := current

 include $(BUILD_PACKAGE)
--- a/apps/NinePatchLab/Android.mk
+++ b/apps/NinePatchLab/Android.mk
@@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-subdir-java-files)

 LOCAL_PACKAGE_NAME := NinePatchLab
+LOCAL_SDK_VERSION := current

 include $(BUILD_PACKAGE)
--- a/apps/SdkSetup/Android.mk
+++ b/apps/SdkSetup/Android.mk
@@ -6,6 +6,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_SRC_FILES := $(call all-subdir-java-files)

 LOCAL_PACKAGE_NAME := SdkSetup
+LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform

 LOCAL_PROGUARD_ENABLED := disabled
--- a/apps/launchperf/Android.mk
+++ b/apps/launchperf/Android.mk
@@ -6,6 +6,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_JAVA_LIBRARIES := android.test.runner

 LOCAL_PACKAGE_NAME := launchperf
+LOCAL_SDK_VERSION := current

 LOCAL_MODULE_TAGS := tests

--- a/samples/RenderScript/Levels/Android.mk
+++ b/samples/RenderScript/Levels/Android.mk
@@ -22,5 +22,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)

 LOCAL_PACKAGE_NAME := LevelsRS
+LOCAL_SDK_VERSION := current

 include $(BUILD_PACKAGE)
--- a/samples/apkcachetest/Android.mk
+++ b/samples/apkcachetest/Android.mk
@@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_SRC_FILES := $(call all-java-files-under, src)

 LOCAL_PACKAGE_NAME := ApkCacheTest
+LOCAL_PRIVATE_PLATFORM_APIS := true

 LOCAL_CERTIFICATE := shared