From a3e79fbb8cdc9ef78e519f2d89e2f70e41864a1d Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 23 Feb 2018 12:57:51 +0000 Subject: [PATCH] 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: Ibcffec873a693d1c792ca210fb597d2bf37e9068 Merged-In: I4233b9091d9066c4fa69f3d24aaf367ea500f760 --- apct-tests/perftests/core/Android.mk | 1 + apct-tests/perftests/multiuser/Android.mk | 1 + core/tests/BTtraffic/Android.mk | 1 + core/tests/ConnectivityManagerTest/Android.mk | 1 + core/tests/SvcMonitor/Android.mk | 1 + core/tests/bandwidthtests/Android.mk | 1 + core/tests/bluetoothtests/Android.mk | 1 + core/tests/coretests/Android.mk | 1 + core/tests/coretests/DisabledTestApp/Android.mk | 1 + core/tests/coretests/EnabledTestApp/Android.mk | 1 + core/tests/coretests/apks/FrameworkCoreTests_apk.mk | 1 + .../hosttests/test-apps/DownloadManagerTestApp/Android.mk | 1 + core/tests/notificationtests/Android.mk | 3 +++ core/tests/packagemanagertests/Android.mk | 1 + core/tests/systemproperties/Android.mk | 1 + core/tests/utiltests/Android.mk | 1 + location/tests/locationtests/Android.mk | 1 + lowpan/tests/Android.mk | 1 + media/mca/samples/CameraEffectsRecordingSample/Android.mk | 1 + media/mca/tests/Android.mk | 1 + media/packages/BluetoothMidiService/Android.mk | 1 + media/tests/EffectsTest/Android.mk | 1 + media/tests/MediaFrameworkTest/Android.mk | 1 + media/tests/NativeMidiDemo/Android.mk | 1 + media/tests/ScoAudioTest/Android.mk | 1 + media/tests/SoundPoolTest/Android.mk | 1 + packages/BackupRestoreConfirmation/Android.mk | 1 + packages/CompanionDeviceManager/Android.mk | 1 + packages/DefaultContainerService/Android.mk | 1 + packages/EasterEgg/Android.mk | 1 + packages/ExtServices/Android.mk | 1 + packages/ExtServices/tests/Android.mk | 1 + packages/ExtShared/Android.mk | 1 + packages/ExternalStorageProvider/Android.mk | 1 + packages/FakeOemFeatures/Android.mk | 1 + packages/FusedLocation/Android.mk | 1 + packages/InputDevices/Android.mk | 1 + packages/MtpDocumentsProvider/Android.mk | 1 + packages/MtpDocumentsProvider/perf_tests/Android.mk | 1 + packages/MtpDocumentsProvider/tests/Android.mk | 1 + packages/Osu/Android.mk | 1 + packages/Osu2/Android.mk | 1 + packages/Osu2/tests/Android.mk | 1 + packages/PrintRecommendationService/Android.mk | 4 ++-- packages/PrintSpooler/Android.mk | 1 + packages/PrintSpooler/tests/outofprocess/Android.mk | 1 + packages/SettingsProvider/Android.mk | 1 + packages/SettingsProvider/test/Android.mk | 1 + packages/SharedStorageBackup/Android.mk | 1 + packages/Shell/Android.mk | 1 + packages/Shell/tests/Android.mk | 1 + packages/StatementService/Android.mk | 1 + packages/VpnDialogs/Android.mk | 1 + packages/WAPPushManager/Android.mk | 1 + packages/WAPPushManager/tests/Android.mk | 1 + packages/WallpaperBackup/Android.mk | 1 + packages/WallpaperCropper/Android.mk | 1 + packages/overlays/SysuiDarkThemeOverlay/Android.mk | 1 + packages/services/PacProcessor/Android.mk | 1 + packages/services/Proxy/Android.mk | 1 + sax/tests/saxtests/Android.mk | 1 + services/tests/notification/Android.mk | 1 + services/tests/servicestests/Android.mk | 1 + .../tests/servicestests/test-apps/ConnTestApp/Android.mk | 1 + test-runner/tests/Android.mk | 2 ++ tests/AccessibilityEventsLogger/Android.mk | 1 + tests/ActivityTests/Android.mk | 1 + tests/AppLaunch/Android.mk | 1 + tests/Assist/Android.mk | 1 + tests/BandwidthTests/Android.mk | 1 + tests/BatteryWaster/Android.mk | 1 + tests/BiDiTests/Android.mk | 1 + tests/BrowserPowerTest/Android.mk | 1 + tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk | 1 + tests/CameraPrewarmTest/Android.mk | 1 + tests/CanvasCompare/Android.mk | 1 + tests/Compatibility/Android.mk | 1 + tests/CoreTests/android/Android.mk | 1 + tests/DataIdleTest/Android.mk | 1 + tests/DozeTest/Android.mk | 1 + tests/DpiTest/Android.mk | 1 + tests/FeatureSplit/base/Android.mk | 1 + tests/FeatureSplit/feature1/Android.mk | 1 + tests/FeatureSplit/feature2/Android.mk | 1 + tests/FixVibrateSetting/Android.mk | 1 + tests/FrameworkPerf/Android.mk | 1 + tests/GridLayoutTest/Android.mk | 1 + tests/HierarchyViewerTest/Android.mk | 5 +++-- tests/HwAccelerationTest/Android.mk | 1 + tests/ImfTest/Android.mk | 1 + tests/ImfTest/tests/Android.mk | 1 + tests/Internal/Android.mk | 1 + tests/JobSchedulerTestApp/Android.mk | 1 + tests/LargeAssetTest/Android.mk | 1 + tests/LegacyAssistant/Android.mk | 1 + tests/LocationTracker/Android.mk | 1 + tests/LockTaskTests/Android.mk | 1 + tests/LotsOfApps/Android.mk | 1 + tests/LowStorageTest/Android.mk | 1 + tests/MemoryUsage/Android.mk | 1 + tests/NetworkSecurityConfigTest/Android.mk | 1 + tests/OneMedia/Android.mk | 1 + tests/RenderThreadTest/Android.mk | 1 + tests/SerialChat/Android.mk | 1 + tests/ServiceCrashTest/Android.mk | 1 + tests/SharedLibrary/client/Android.mk | 1 + tests/SharedLibrary/lib/Android.mk | 1 + tests/ShowWhenLockedApp/Android.mk | 1 + tests/SmokeTestApps/Android.mk | 1 + tests/SoundTriggerTestApp/Android.mk | 1 + tests/SoundTriggerTests/Android.mk | 1 + tests/Split/Android.mk | 1 + tests/StatusBar/Android.mk | 1 + tests/SystemUIDemoModeController/Android.mk | 1 + tests/TouchLatency/Android.mk | 1 + tests/TransformTest/Android.mk | 1 + tests/TransitionTests/Android.mk | 1 + tests/TtsTests/Android.mk | 1 + tests/UsageStatsTest/Android.mk | 1 + tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk | 1 + tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk | 1 + .../UsbHostExternalManagmentTestApp/Android.mk | 1 + tests/UsesFeature2Test/Android.mk | 1 + tests/VectorDrawableTest/Android.mk | 1 + tests/VoiceEnrollment/Android.mk | 1 + tests/VoiceInteraction/Android.mk | 1 + tests/WallpaperTest/Android.mk | 1 + tests/WindowManagerStressTest/Android.mk | 1 + tests/appwidgets/AppWidgetHostTest/Android.mk | 1 + tests/appwidgets/AppWidgetProviderTest/Android.mk | 1 + tests/backup/Android.mk | 1 + tests/permission/Android.mk | 1 + tests/testables/tests/Android.mk | 1 + tests/utils/DummyIME/Android.mk | 1 + 134 files changed, 140 insertions(+), 4 deletions(-) diff --git a/apct-tests/perftests/core/Android.mk b/apct-tests/perftests/core/Android.mk index 200f92fb590c3..63867c923c421 100644 --- a/apct-tests/perftests/core/Android.mk +++ b/apct-tests/perftests/core/Android.mk @@ -12,6 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test LOCAL_PACKAGE_NAME := CorePerfTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JNI_SHARED_LIBRARIES := libperftestscore_jni diff --git a/apct-tests/perftests/multiuser/Android.mk b/apct-tests/perftests/multiuser/Android.mk index e3f7775383bdc..4617af87a15a1 100644 --- a/apct-tests/perftests/multiuser/Android.mk +++ b/apct-tests/perftests/multiuser/Android.mk @@ -23,6 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test LOCAL_PACKAGE_NAME := MultiUserPerfTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/core/tests/BTtraffic/Android.mk b/core/tests/BTtraffic/Android.mk index 7d8352717a340..f826ae9d79a18 100644 --- a/core/tests/BTtraffic/Android.mk +++ b/core/tests/BTtraffic/Android.mk @@ -9,6 +9,7 @@ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := bttraffic +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/core/tests/ConnectivityManagerTest/Android.mk b/core/tests/ConnectivityManagerTest/Android.mk index 39cf4a49ffbfc..93c53d2f14928 100644 --- a/core/tests/ConnectivityManagerTest/Android.mk +++ b/core/tests/ConnectivityManagerTest/Android.mk @@ -25,6 +25,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ConnectivityManagerTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/core/tests/SvcMonitor/Android.mk b/core/tests/SvcMonitor/Android.mk index 2b8045506f02e..94ddccbb71c0d 100644 --- a/core/tests/SvcMonitor/Android.mk +++ b/core/tests/SvcMonitor/Android.mk @@ -9,6 +9,7 @@ LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := svcmonitor +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/core/tests/bandwidthtests/Android.mk b/core/tests/bandwidthtests/Android.mk index 2af92dfe61046..56526bc38e99b 100644 --- a/core/tests/bandwidthtests/Android.mk +++ b/core/tests/bandwidthtests/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := \ LOCAL_JAVA_LIBRARIES := android.test.runner org.apache.http.legacy LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := BandwidthTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/core/tests/bluetoothtests/Android.mk b/core/tests/bluetoothtests/Android.mk index f53419ab53cd9..41582deb7fe5e 100644 --- a/core/tests/bluetoothtests/Android.mk +++ b/core/tests/bluetoothtests/Android.mk @@ -11,6 +11,7 @@ LOCAL_SRC_FILES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := BluetoothTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index dbc9e5d55e375..a802e75b52277 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -40,6 +40,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt telephony-common org.apache.http.legacy LOCAL_PACKAGE_NAME := FrameworksCoreTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/core/tests/coretests/DisabledTestApp/Android.mk b/core/tests/coretests/DisabledTestApp/Android.mk index a5daedf06b8d6..e4304f7cef735 100644 --- a/core/tests/coretests/DisabledTestApp/Android.mk +++ b/core/tests/coretests/DisabledTestApp/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := DisabledTestApp +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/core/tests/coretests/EnabledTestApp/Android.mk b/core/tests/coretests/EnabledTestApp/Android.mk index 4b986d39b2097..cd37f0883c631 100644 --- a/core/tests/coretests/EnabledTestApp/Android.mk +++ b/core/tests/coretests/EnabledTestApp/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := EnabledTestApp +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/core/tests/coretests/apks/FrameworkCoreTests_apk.mk b/core/tests/coretests/apks/FrameworkCoreTests_apk.mk index 1e032703e8b29..8a7d72a5200b5 100644 --- a/core/tests/coretests/apks/FrameworkCoreTests_apk.mk +++ b/core/tests/coretests/apks/FrameworkCoreTests_apk.mk @@ -6,6 +6,7 @@ LOCAL_DEX_PREOPT := false # Make sure every package name gets the FrameworkCoreTests_ prefix. LOCAL_PACKAGE_NAME := FrameworkCoreTests_$(LOCAL_PACKAGE_NAME) +LOCAL_SDK_VERSION := current # Every package should have a native library LOCAL_JNI_SHARED_LIBRARIES := libframeworks_coretests_jni diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk index 47ee2cfe6e908..3261a1a6dbd6b 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk @@ -24,6 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit legacy-android LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := DownloadManagerTestApp +LOCAL_PRIVATE_PLATFORM_APIS := true ifneq ($(TARGET_BUILD_VARIANT),user) # Need to run as system app to get access to Settings. This test won't work for user builds. diff --git a/core/tests/notificationtests/Android.mk b/core/tests/notificationtests/Android.mk index 0551eb6b75ad4..910d5aaaabb7c 100644 --- a/core/tests/notificationtests/Android.mk +++ b/core/tests/notificationtests/Android.mk @@ -10,6 +10,9 @@ LOCAL_SRC_FILES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := NotificationStressTests +# Could build against SDK if it wasn't for the @RepetitiveTest annotation. +LOCAL_PRIVATE_PLATFORM_APIS := true + LOCAL_STATIC_JAVA_LIBRARIES := \ junit \ diff --git a/core/tests/packagemanagertests/Android.mk b/core/tests/packagemanagertests/Android.mk index 5bfde78c424a1..f95231f1d397b 100644 --- a/core/tests/packagemanagertests/Android.mk +++ b/core/tests/packagemanagertests/Android.mk @@ -15,6 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCorePackageManagerTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk index 4c2e2247a113a..d58ed54a4c89d 100644 --- a/core/tests/systemproperties/Android.mk +++ b/core/tests/systemproperties/Android.mk @@ -12,6 +12,7 @@ LOCAL_DX_FLAGS := --core-library LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCoreSystemPropertiesTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/core/tests/utiltests/Android.mk b/core/tests/utiltests/Android.mk index 233d070f95071..b142af0d9b62d 100644 --- a/core/tests/utiltests/Android.mk +++ b/core/tests/utiltests/Android.mk @@ -22,6 +22,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksUtilTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/location/tests/locationtests/Android.mk b/location/tests/locationtests/Android.mk index 902cd96067e96..c65f596da46cb 100644 --- a/location/tests/locationtests/Android.mk +++ b/location/tests/locationtests/Android.mk @@ -9,6 +9,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksLocationTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/lowpan/tests/Android.mk b/lowpan/tests/Android.mk index bb0a944b5e7d1..9043672374d4d 100644 --- a/lowpan/tests/Android.mk +++ b/lowpan/tests/Android.mk @@ -58,6 +58,7 @@ LOCAL_JAVA_LIBRARIES := \ android.test.runner \ LOCAL_PACKAGE_NAME := FrameworksLowpanApiTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/media/mca/samples/CameraEffectsRecordingSample/Android.mk b/media/mca/samples/CameraEffectsRecordingSample/Android.mk index d3c43364d16eb..c81f2fc57dc3d 100644 --- a/media/mca/samples/CameraEffectsRecordingSample/Android.mk +++ b/media/mca/samples/CameraEffectsRecordingSample/Android.mk @@ -23,6 +23,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := CameraEffectsRecordingSample +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PROGUARD_ENABLED := disabled diff --git a/media/mca/tests/Android.mk b/media/mca/tests/Android.mk index eb451f72e49e8..5da07c6dfffd9 100644 --- a/media/mca/tests/Android.mk +++ b/media/mca/tests/Android.mk @@ -11,6 +11,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CameraEffectsTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := CameraEffectsRecordingSample diff --git a/media/packages/BluetoothMidiService/Android.mk b/media/packages/BluetoothMidiService/Android.mk index 05659251f7aaf..6f262bf6007ab 100644 --- a/media/packages/BluetoothMidiService/Android.mk +++ b/media/packages/BluetoothMidiService/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES += \ $(call all-java-files-under,src) LOCAL_PACKAGE_NAME := BluetoothMidiService +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/media/tests/EffectsTest/Android.mk b/media/tests/EffectsTest/Android.mk index 25b4fe4959146..a066950985a96 100644 --- a/media/tests/EffectsTest/Android.mk +++ b/media/tests/EffectsTest/Android.mk @@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := EffectsTest +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/media/tests/MediaFrameworkTest/Android.mk b/media/tests/MediaFrameworkTest/Android.mk index 0d9f42b930073..3c6119e3bd203 100644 --- a/media/tests/MediaFrameworkTest/Android.mk +++ b/media/tests/MediaFrameworkTest/Android.mk @@ -14,5 +14,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test LOCAL_PACKAGE_NAME := mediaframeworktest +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/media/tests/NativeMidiDemo/Android.mk b/media/tests/NativeMidiDemo/Android.mk index 6b08f6bba3f41..316858f667fd9 100644 --- a/media/tests/NativeMidiDemo/Android.mk +++ b/media/tests/NativeMidiDemo/Android.mk @@ -19,6 +19,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := NativeMidiDemo #LOCAL_SDK_VERSION := current +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PROGUARD_ENABLED := disabled LOCAL_SRC_FILES := $(call all-java-files-under, java) diff --git a/media/tests/ScoAudioTest/Android.mk b/media/tests/ScoAudioTest/Android.mk index ab12865bc9507..2ad91a4c36a2b 100644 --- a/media/tests/ScoAudioTest/Android.mk +++ b/media/tests/ScoAudioTest/Android.mk @@ -2,6 +2,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) #LOCAL_SDK_VERSION := current +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/media/tests/SoundPoolTest/Android.mk b/media/tests/SoundPoolTest/Android.mk index 7f947c0dfbc60..9ca33c8c2ef26 100644 --- a/media/tests/SoundPoolTest/Android.mk +++ b/media/tests/SoundPoolTest/Android.mk @@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := SoundPoolTest +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/packages/BackupRestoreConfirmation/Android.mk b/packages/BackupRestoreConfirmation/Android.mk index b84c07f359f46..532d272f70f3d 100644 --- a/packages/BackupRestoreConfirmation/Android.mk +++ b/packages/BackupRestoreConfirmation/Android.mk @@ -22,6 +22,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := BackupRestoreConfirmation +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/CompanionDeviceManager/Android.mk b/packages/CompanionDeviceManager/Android.mk index f730356e6947b..7ec6e1146060d 100644 --- a/packages/CompanionDeviceManager/Android.mk +++ b/packages/CompanionDeviceManager/Android.mk @@ -21,6 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CompanionDeviceManager +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/packages/DefaultContainerService/Android.mk b/packages/DefaultContainerService/Android.mk index 0de2c1fe4a6a7..01c8768d349af 100644 --- a/packages/DefaultContainerService/Android.mk +++ b/packages/DefaultContainerService/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := DefaultContainerService +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JNI_SHARED_LIBRARIES := libdefcontainer_jni diff --git a/packages/EasterEgg/Android.mk b/packages/EasterEgg/Android.mk index d4c1e7094b99d..dac3ed658afe7 100644 --- a/packages/EasterEgg/Android.mk +++ b/packages/EasterEgg/Android.mk @@ -15,6 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := EasterEgg +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/packages/ExtServices/Android.mk b/packages/ExtServices/Android.mk index d0c2b9f4e0a52..467d7ed202cdc 100644 --- a/packages/ExtServices/Android.mk +++ b/packages/ExtServices/Android.mk @@ -21,6 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ExtServices +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/packages/ExtServices/tests/Android.mk b/packages/ExtServices/tests/Android.mk index cb3c352a6742b..f18904ddc4c75 100644 --- a/packages/ExtServices/tests/Android.mk +++ b/packages/ExtServices/tests/Android.mk @@ -18,6 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ExtServicesUnitTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := ExtServices diff --git a/packages/ExtShared/Android.mk b/packages/ExtShared/Android.mk index d8052df8a8e8b..7dbf79fd1eac7 100644 --- a/packages/ExtShared/Android.mk +++ b/packages/ExtShared/Android.mk @@ -21,6 +21,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ExtShared +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform diff --git a/packages/ExternalStorageProvider/Android.mk b/packages/ExternalStorageProvider/Android.mk index db825ff49b4ca..9e99313cd03a3 100644 --- a/packages/ExternalStorageProvider/Android.mk +++ b/packages/ExternalStorageProvider/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := ExternalStorageProvider +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/FakeOemFeatures/Android.mk b/packages/FakeOemFeatures/Android.mk index d96bb3d7d2784..43de8e5315ccb 100644 --- a/packages/FakeOemFeatures/Android.mk +++ b/packages/FakeOemFeatures/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := FakeOemFeatures +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_ENABLED := disabled diff --git a/packages/FusedLocation/Android.mk b/packages/FusedLocation/Android.mk index 7406eaf4e131f..d795870251dba 100644 --- a/packages/FusedLocation/Android.mk +++ b/packages/FusedLocation/Android.mk @@ -22,6 +22,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := com.android.location.provider LOCAL_PACKAGE_NAME := FusedLocation +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/InputDevices/Android.mk b/packages/InputDevices/Android.mk index e7190dc908437..6de1f1d43f72e 100644 --- a/packages/InputDevices/Android.mk +++ b/packages/InputDevices/Android.mk @@ -22,6 +22,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := LOCAL_PACKAGE_NAME := InputDevices +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/MtpDocumentsProvider/Android.mk b/packages/MtpDocumentsProvider/Android.mk index a9e9b2e1a6211..2d62a07566bf9 100644 --- a/packages/MtpDocumentsProvider/Android.mk +++ b/packages/MtpDocumentsProvider/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := MtpDocumentsProvider +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := media LOCAL_PRIVILEGED_MODULE := true LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/packages/MtpDocumentsProvider/perf_tests/Android.mk b/packages/MtpDocumentsProvider/perf_tests/Android.mk index f0d4878fd5e3d..6504af12db23c 100644 --- a/packages/MtpDocumentsProvider/perf_tests/Android.mk +++ b/packages/MtpDocumentsProvider/perf_tests/Android.mk @@ -5,6 +5,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_PACKAGE_NAME := MtpDocumentsProviderPerfTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := MtpDocumentsProvider LOCAL_CERTIFICATE := media diff --git a/packages/MtpDocumentsProvider/tests/Android.mk b/packages/MtpDocumentsProvider/tests/Android.mk index 148cd0d930ab1..25b585fd3262e 100644 --- a/packages/MtpDocumentsProvider/tests/Android.mk +++ b/packages/MtpDocumentsProvider/tests/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := MtpDocumentsProviderTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := MtpDocumentsProvider LOCAL_CERTIFICATE := media LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/packages/Osu/Android.mk b/packages/Osu/Android.mk index 1d45aa9bfe66f..63c7578b01635 100644 --- a/packages/Osu/Android.mk +++ b/packages/Osu/Android.mk @@ -14,6 +14,7 @@ LOCAL_SRC_FILES += \ LOCAL_JAVA_LIBRARIES := telephony-common ims-common bouncycastle conscrypt LOCAL_PACKAGE_NAME := Osu +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/Osu2/Android.mk b/packages/Osu2/Android.mk index 05586f014ce70..063ac7ec00f4b 100644 --- a/packages/Osu2/Android.mk +++ b/packages/Osu2/Android.mk @@ -9,6 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := Osu2 +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/Osu2/tests/Android.mk b/packages/Osu2/tests/Android.mk index 4b6e0e60652b5..8d5a39956beec 100644 --- a/packages/Osu2/tests/Android.mk +++ b/packages/Osu2/tests/Android.mk @@ -25,6 +25,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PACKAGE_NAME := OsuTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_INSTRUMENTATION_FOR := Osu2 diff --git a/packages/PrintRecommendationService/Android.mk b/packages/PrintRecommendationService/Android.mk index 66cb0573aef0a..fa1eb0db73ace 100644 --- a/packages/PrintRecommendationService/Android.mk +++ b/packages/PrintRecommendationService/Android.mk @@ -22,8 +22,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PrintRecommendationService +LOCAL_PRIVATE_PLATFORM_APIS := true + include $(BUILD_PACKAGE) -LOCAL_SDK_VERSION := system_current - include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/packages/PrintSpooler/Android.mk b/packages/PrintSpooler/Android.mk index 19e44e36447d9..67ef6b4851c69 100644 --- a/packages/PrintSpooler/Android.mk +++ b/packages/PrintSpooler/Android.mk @@ -26,6 +26,7 @@ LOCAL_SRC_FILES += \ src/com/android/printspooler/renderer/IPdfEditor.aidl LOCAL_PACKAGE_NAME := PrintSpooler +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JNI_SHARED_LIBRARIES := libprintspooler_jni LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview diff --git a/packages/PrintSpooler/tests/outofprocess/Android.mk b/packages/PrintSpooler/tests/outofprocess/Android.mk index 3c02453c78a12..56afd8993788c 100644 --- a/packages/PrintSpooler/tests/outofprocess/Android.mk +++ b/packages/PrintSpooler/tests/outofprocess/Android.mk @@ -24,6 +24,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 LOCAL_PACKAGE_NAME := PrintSpoolerOutOfProcessTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) diff --git a/packages/SettingsProvider/Android.mk b/packages/SettingsProvider/Android.mk index 069e83a8d2d62..74ce9196c0439 100644 --- a/packages/SettingsProvider/Android.mk +++ b/packages/SettingsProvider/Android.mk @@ -10,6 +10,7 @@ LOCAL_JAVA_LIBRARIES := telephony-common ims-common LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := SettingsProvider +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/SettingsProvider/test/Android.mk b/packages/SettingsProvider/test/Android.mk index a9707d4ae69b9..091ba90efd733 100644 --- a/packages/SettingsProvider/test/Android.mk +++ b/packages/SettingsProvider/test/Android.mk @@ -15,6 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_JAVA_LIBRARIES := legacy-android-test LOCAL_PACKAGE_NAME := SettingsProviderTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/packages/SharedStorageBackup/Android.mk b/packages/SharedStorageBackup/Android.mk index a213965f085b4..2e07ab18d71af 100644 --- a/packages/SharedStorageBackup/Android.mk +++ b/packages/SharedStorageBackup/Android.mk @@ -24,6 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PACKAGE_NAME := SharedStorageBackup +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/Shell/Android.mk b/packages/Shell/Android.mk index 935d09b20fe65..5713dc679341f 100644 --- a/packages/Shell/Android.mk +++ b/packages/Shell/Android.mk @@ -15,6 +15,7 @@ LOCAL_AIDL_INCLUDES = frameworks/native/cmds/dumpstate/binder LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 LOCAL_PACKAGE_NAME := Shell +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/Shell/tests/Android.mk b/packages/Shell/tests/Android.mk index 48b757c30cd19..cf60fb4b7daf0 100644 --- a/packages/Shell/tests/Android.mk +++ b/packages/Shell/tests/Android.mk @@ -16,6 +16,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ legacy-android-test \ LOCAL_PACKAGE_NAME := ShellTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_INSTRUMENTATION_FOR := Shell diff --git a/packages/StatementService/Android.mk b/packages/StatementService/Android.mk index 470d824a1868b..b9b29e752193b 100644 --- a/packages/StatementService/Android.mk +++ b/packages/StatementService/Android.mk @@ -22,6 +22,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PACKAGE_NAME := StatementService +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVILEGED_MODULE := true LOCAL_JAVA_LIBRARIES += org.apache.http.legacy diff --git a/packages/VpnDialogs/Android.mk b/packages/VpnDialogs/Android.mk index 4c80a26d186c1..850764645644a 100644 --- a/packages/VpnDialogs/Android.mk +++ b/packages/VpnDialogs/Android.mk @@ -27,5 +27,6 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := VpnDialogs +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/packages/WAPPushManager/Android.mk b/packages/WAPPushManager/Android.mk index 60f093f7ac41b..91526dd19ce0d 100644 --- a/packages/WAPPushManager/Android.mk +++ b/packages/WAPPushManager/Android.mk @@ -9,6 +9,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := WAPPushManager +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JAVA_LIBRARIES += telephony-common LOCAL_STATIC_JAVA_LIBRARIES += android-common diff --git a/packages/WAPPushManager/tests/Android.mk b/packages/WAPPushManager/tests/Android.mk index 1dea798e83b22..8ad0018b780e9 100644 --- a/packages/WAPPushManager/tests/Android.mk +++ b/packages/WAPPushManager/tests/Android.mk @@ -32,6 +32,7 @@ LOCAL_SRC_FILES += \ # automatically get all of its classes loaded into our environment. LOCAL_PACKAGE_NAME := WAPPushManagerTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := WAPPushManager diff --git a/packages/WallpaperBackup/Android.mk b/packages/WallpaperBackup/Android.mk index cf0424966c105..a6426a6ce2174 100644 --- a/packages/WallpaperBackup/Android.mk +++ b/packages/WallpaperBackup/Android.mk @@ -24,6 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_PACKAGE_NAME := WallpaperBackup +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := false diff --git a/packages/WallpaperCropper/Android.mk b/packages/WallpaperCropper/Android.mk index 0254673be5930..e0a0ef415cb48 100644 --- a/packages/WallpaperCropper/Android.mk +++ b/packages/WallpaperCropper/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_PACKAGE_NAME := WallpaperCropper +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/overlays/SysuiDarkThemeOverlay/Android.mk b/packages/overlays/SysuiDarkThemeOverlay/Android.mk index 4b83058ab4810..7b277bcf03511 100644 --- a/packages/overlays/SysuiDarkThemeOverlay/Android.mk +++ b/packages/overlays/SysuiDarkThemeOverlay/Android.mk @@ -9,5 +9,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := SysuiDarkThemeOverlay +LOCAL_SDK_VERSION := current include $(BUILD_RRO_PACKAGE) diff --git a/packages/services/PacProcessor/Android.mk b/packages/services/PacProcessor/Android.mk index 3c4e951f9e738..5be90c0bf3d51 100644 --- a/packages/services/PacProcessor/Android.mk +++ b/packages/services/PacProcessor/Android.mk @@ -23,6 +23,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PacProcessor +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JNI_SHARED_LIBRARIES := libjni_pacprocessor diff --git a/packages/services/Proxy/Android.mk b/packages/services/Proxy/Android.mk index d5546b27bf445..ce1715f08be59 100644 --- a/packages/services/Proxy/Android.mk +++ b/packages/services/Proxy/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ProxyHandler +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/sax/tests/saxtests/Android.mk b/sax/tests/saxtests/Android.mk index d3fbd0569e781..f02949893e00d 100644 --- a/sax/tests/saxtests/Android.mk +++ b/sax/tests/saxtests/Android.mk @@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := FrameworksSaxTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/services/tests/notification/Android.mk b/services/tests/notification/Android.mk index 597a5849a1a0b..1ccb872e65bd1 100644 --- a/services/tests/notification/Android.mk +++ b/services/tests/notification/Android.mk @@ -31,6 +31,7 @@ LOCAL_JACK_FLAGS := --multi-dex native LOCAL_DX_FLAGS := --multi-dex LOCAL_PACKAGE_NAME := FrameworksNotificationTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 19396d43e15e4..9af0978c1497e 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk @@ -35,6 +35,7 @@ LOCAL_SRC_FILES += aidl/com/android/servicestests/aidl/INetworkStateObserver.aid LOCAL_JAVA_LIBRARIES := android.test.mock legacy-android-test LOCAL_PACKAGE_NAME := FrameworksServicesTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/services/tests/servicestests/test-apps/ConnTestApp/Android.mk b/services/tests/servicestests/test-apps/ConnTestApp/Android.mk index fbfa28a9e93b6..18b8c2d633139 100644 --- a/services/tests/servicestests/test-apps/ConnTestApp/Android.mk +++ b/services/tests/servicestests/test-apps/ConnTestApp/Android.mk @@ -24,6 +24,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := servicestests-aidl LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := ConnTestApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_DEX_PREOPT := false LOCAL_PROGUARD_ENABLED := disabled diff --git a/test-runner/tests/Android.mk b/test-runner/tests/Android.mk index 7ee047e470587..7b9e9a4a09e61 100644 --- a/test-runner/tests/Android.mk +++ b/test-runner/tests/Android.mk @@ -32,6 +32,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := FrameworkTestRunnerTests +# Because of android.test.mock. +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/AccessibilityEventsLogger/Android.mk b/tests/AccessibilityEventsLogger/Android.mk index 52bc57900e3f3..4224017993e24 100644 --- a/tests/AccessibilityEventsLogger/Android.mk +++ b/tests/AccessibilityEventsLogger/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := AccessibilityEventsLogger +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/ActivityTests/Android.mk b/tests/ActivityTests/Android.mk index f3c6b5a0cedf6..274fc5fcf471c 100644 --- a/tests/ActivityTests/Android.mk +++ b/tests/ActivityTests/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := ActivityTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform diff --git a/tests/AppLaunch/Android.mk b/tests/AppLaunch/Android.mk index d01b1f96ee050..9cbb4ed1fba91 100644 --- a/tests/AppLaunch/Android.mk +++ b/tests/AppLaunch/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := AppLaunch +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := legacy-android-test diff --git a/tests/Assist/Android.mk b/tests/Assist/Android.mk index f31c4ddfbca61..d0d3ecaa5dec9 100644 --- a/tests/Assist/Android.mk +++ b/tests/Assist/Android.mk @@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := Assist +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/BandwidthTests/Android.mk b/tests/BandwidthTests/Android.mk index 7bc5f857e9209..d00fdc68cda48 100644 --- a/tests/BandwidthTests/Android.mk +++ b/tests/BandwidthTests/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := BandwidthEnforcementTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) include $(BUILD_PACKAGE) diff --git a/tests/BatteryWaster/Android.mk b/tests/BatteryWaster/Android.mk index 6db34a71bbf43..fb244a8561212 100644 --- a/tests/BatteryWaster/Android.mk +++ b/tests/BatteryWaster/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := BatteryWaster +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/BiDiTests/Android.mk b/tests/BiDiTests/Android.mk index ae29fc262b13b..78cf4be66fbe6 100644 --- a/tests/BiDiTests/Android.mk +++ b/tests/BiDiTests/Android.mk @@ -21,6 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := BiDiTests +LOCAL_SDK_VERSION := current LOCAL_PROGUARD_FLAG_FILES := proguard.flags diff --git a/tests/BrowserPowerTest/Android.mk b/tests/BrowserPowerTest/Android.mk index 59bc729a62807..50f1d10f39395 100644 --- a/tests/BrowserPowerTest/Android.mk +++ b/tests/BrowserPowerTest/Android.mk @@ -25,6 +25,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := BrowserPowerTests +LOCAL_PRIVATE_PLATFORM_APIS := true #LOCAL_INSTRUMENTATION_FOR := browserpowertest diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk index 527d1bbfd8867..541bddc0f4546 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests # LOCAL_SDK_VERSION := current +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PACKAGE_NAME := SmartCamera-tests diff --git a/tests/CameraPrewarmTest/Android.mk b/tests/CameraPrewarmTest/Android.mk index b6316f0ff10ee..e12850469245a 100644 --- a/tests/CameraPrewarmTest/Android.mk +++ b/tests/CameraPrewarmTest/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := CameraPrewarmTest +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform diff --git a/tests/CanvasCompare/Android.mk b/tests/CanvasCompare/Android.mk index 90de503ebd819..6b850a9836c89 100644 --- a/tests/CanvasCompare/Android.mk +++ b/tests/CanvasCompare/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_PACKAGE_NAME := CanvasCompare +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/tests/Compatibility/Android.mk b/tests/Compatibility/Android.mk index 82e212688637b..9c47a26102235 100644 --- a/tests/Compatibility/Android.mk +++ b/tests/Compatibility/Android.mk @@ -24,6 +24,7 @@ LOCAL_SRC_FILES := \ LOCAL_PACKAGE_NAME := AppCompatibilityTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/CoreTests/android/Android.mk b/tests/CoreTests/android/Android.mk index c9f11615381fa..e5682644b7721 100644 --- a/tests/CoreTests/android/Android.mk +++ b/tests/CoreTests/android/Android.mk @@ -10,5 +10,6 @@ LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt org.apache.ht LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := CoreTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/DataIdleTest/Android.mk b/tests/DataIdleTest/Android.mk index 4e15729221a91..17ba75f1bef21 100644 --- a/tests/DataIdleTest/Android.mk +++ b/tests/DataIdleTest/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := DataIdleTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/tests/DozeTest/Android.mk b/tests/DozeTest/Android.mk index 01f10e5ac1deb..ec250ffe3aa03 100644 --- a/tests/DozeTest/Android.mk +++ b/tests/DozeTest/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := DozeTest +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/DpiTest/Android.mk b/tests/DpiTest/Android.mk index f55ce6e3bdfda..e69d0826bb577 100644 --- a/tests/DpiTest/Android.mk +++ b/tests/DpiTest/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := DensityTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/tests/FeatureSplit/base/Android.mk b/tests/FeatureSplit/base/Android.mk index 93f6d7a5f52be..5ddceda99fcaf 100644 --- a/tests/FeatureSplit/base/Android.mk +++ b/tests/FeatureSplit/base/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) 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 e6ba5c2d04c97..d4d25890431e0 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 c8e860942fa3a..5e5e78bcfff5f 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 diff --git a/tests/FixVibrateSetting/Android.mk b/tests/FixVibrateSetting/Android.mk index 2a88e5a4f5843..86db09eaa20d7 100644 --- a/tests/FixVibrateSetting/Android.mk +++ b/tests/FixVibrateSetting/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FixVibrateSetting +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/FrameworkPerf/Android.mk b/tests/FrameworkPerf/Android.mk index d2ec75347531c..b083c12df3682 100644 --- a/tests/FrameworkPerf/Android.mk +++ b/tests/FrameworkPerf/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := FrameworkPerf +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test diff --git a/tests/GridLayoutTest/Android.mk b/tests/GridLayoutTest/Android.mk index a02918b0a464d..e7e3ccd569861 100644 --- a/tests/GridLayoutTest/Android.mk +++ b/tests/GridLayoutTest/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := GridLayoutTest +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests diff --git a/tests/HierarchyViewerTest/Android.mk b/tests/HierarchyViewerTest/Android.mk index f8c865631f936..cf1a512b6d570 100644 --- a/tests/HierarchyViewerTest/Android.mk +++ b/tests/HierarchyViewerTest/Android.mk @@ -6,8 +6,9 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := HierarchyViewerTest +LOCAL_SDK_VERSION := current -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test +LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs +LOCAL_STATIC_JAVA_LIBRARIES := junit include $(BUILD_PACKAGE) diff --git a/tests/HwAccelerationTest/Android.mk b/tests/HwAccelerationTest/Android.mk index d4743f938d4b9..11ea954c62c7a 100644 --- a/tests/HwAccelerationTest/Android.mk +++ b/tests/HwAccelerationTest/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := HwAccelerationTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/tests/ImfTest/Android.mk b/tests/ImfTest/Android.mk index eb5327b112130..a8f5b0867c650 100644 --- a/tests/ImfTest/Android.mk +++ b/tests/ImfTest/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ImfTest +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/ImfTest/tests/Android.mk b/tests/ImfTest/tests/Android.mk index 60424712d02c7..2a4999885bd4b 100644 --- a/tests/ImfTest/tests/Android.mk +++ b/tests/ImfTest/tests/Android.mk @@ -11,6 +11,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := ImfTestTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := ImfTest diff --git a/tests/Internal/Android.mk b/tests/Internal/Android.mk index fc001e928e80b..a8fb395eda816 100644 --- a/tests/Internal/Android.mk +++ b/tests/Internal/Android.mk @@ -18,6 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit \ LOCAL_CERTIFICATE := platform LOCAL_PACKAGE_NAME := InternalTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) diff --git a/tests/JobSchedulerTestApp/Android.mk b/tests/JobSchedulerTestApp/Android.mk index 7336d8c6a00da..48ee1f6737554 100644 --- a/tests/JobSchedulerTestApp/Android.mk +++ b/tests/JobSchedulerTestApp/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := JobSchedulerTestApp +LOCAL_SDK_VERSION := current LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/LargeAssetTest/Android.mk b/tests/LargeAssetTest/Android.mk index cb7f01be8b40b..f6d98bfa094ac 100644 --- a/tests/LargeAssetTest/Android.mk +++ b/tests/LargeAssetTest/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := LargeAssetTest +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/LegacyAssistant/Android.mk b/tests/LegacyAssistant/Android.mk index 0ad48d1ccef0f..a58336967f7ee 100644 --- a/tests/LegacyAssistant/Android.mk +++ b/tests/LegacyAssistant/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := LegacyAssistant +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform diff --git a/tests/LocationTracker/Android.mk b/tests/LocationTracker/Android.mk index b142d2269b00f..0d51b3bcf13f2 100644 --- a/tests/LocationTracker/Android.mk +++ b/tests/LocationTracker/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := LocationTracker +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests diff --git a/tests/LockTaskTests/Android.mk b/tests/LockTaskTests/Android.mk index ed5864304b672..a693eaa4da04e 100644 --- a/tests/LockTaskTests/Android.mk +++ b/tests/LockTaskTests/Android.mk @@ -5,6 +5,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/priv-app LOCAL_PACKAGE_NAME := LockTaskTests +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform LOCAL_SRC_FILES := $(call all-Iaidl-files-under, src) $(call all-java-files-under, src) diff --git a/tests/LotsOfApps/Android.mk b/tests/LotsOfApps/Android.mk index 0ef9550b80848..bee3bcc7ca518 100644 --- a/tests/LotsOfApps/Android.mk +++ b/tests/LotsOfApps/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := LotsOfApps +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/LowStorageTest/Android.mk b/tests/LowStorageTest/Android.mk index ab5b9e925ed62..bdde6bdc2fe14 100644 --- a/tests/LowStorageTest/Android.mk +++ b/tests/LowStorageTest/Android.mk @@ -21,5 +21,6 @@ LOCAL_CERTIFICATE := platform LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := lowstoragetest +LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) diff --git a/tests/MemoryUsage/Android.mk b/tests/MemoryUsage/Android.mk index 578e628987f11..bab6a7087e40c 100644 --- a/tests/MemoryUsage/Android.mk +++ b/tests/MemoryUsage/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := MemoryUsage +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.runner diff --git a/tests/NetworkSecurityConfigTest/Android.mk b/tests/NetworkSecurityConfigTest/Android.mk index dd9ff11971eb2..e29090be29d9c 100644 --- a/tests/NetworkSecurityConfigTest/Android.mk +++ b/tests/NetworkSecurityConfigTest/Android.mk @@ -12,5 +12,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := NetworkSecurityConfigTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/OneMedia/Android.mk b/tests/OneMedia/Android.mk index 9fc64035a9140..41f3f64235d4c 100644 --- a/tests/OneMedia/Android.mk +++ b/tests/OneMedia/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \ $(call all-Iaidl-files-under, src) LOCAL_PACKAGE_NAME := OneMedia +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES += org.apache.http.legacy diff --git a/tests/RenderThreadTest/Android.mk b/tests/RenderThreadTest/Android.mk index e07e943b9ca28..4e5f35bd71ca4 100644 --- a/tests/RenderThreadTest/Android.mk +++ b/tests/RenderThreadTest/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := RenderThreadTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_STATIC_JAVA_LIBRARIES += android-common diff --git a/tests/SerialChat/Android.mk b/tests/SerialChat/Android.mk index a534e1a86a863..ed6ca99914171 100644 --- a/tests/SerialChat/Android.mk +++ b/tests/SerialChat/Android.mk @@ -22,5 +22,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := SerialChat +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/ServiceCrashTest/Android.mk b/tests/ServiceCrashTest/Android.mk index d1f845623be8a..3aa7132367f0b 100644 --- a/tests/ServiceCrashTest/Android.mk +++ b/tests/ServiceCrashTest/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ServiceCrashTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := legacy-android-test diff --git a/tests/SharedLibrary/client/Android.mk b/tests/SharedLibrary/client/Android.mk index a04fb05509989..9e76c4038600f 100644 --- a/tests/SharedLibrary/client/Android.mk +++ b/tests/SharedLibrary/client/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_RES_LIBRARIES := SharedLibrary LOCAL_PACKAGE_NAME := SharedLibraryClient +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests diff --git a/tests/SharedLibrary/lib/Android.mk b/tests/SharedLibrary/lib/Android.mk index 78fcb8b7c0a6e..3c1ca87643869 100644 --- a/tests/SharedLibrary/lib/Android.mk +++ b/tests/SharedLibrary/lib/Android.mk @@ -6,6 +6,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_AAPT_FLAGS := --shared-lib LOCAL_PACKAGE_NAME := SharedLibrary +LOCAL_SDK_VERSION := current LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_PRIVILEGED_MODULE := true diff --git a/tests/ShowWhenLockedApp/Android.mk b/tests/ShowWhenLockedApp/Android.mk index 006416791dd96..41e0ac42a5a90 100644 --- a/tests/ShowWhenLockedApp/Android.mk +++ b/tests/ShowWhenLockedApp/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := ShowWhenLocked +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests diff --git a/tests/SmokeTestApps/Android.mk b/tests/SmokeTestApps/Android.mk index 3f5f0118b1ac4..1f564e06bb85f 100644 --- a/tests/SmokeTestApps/Android.mk +++ b/tests/SmokeTestApps/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := SmokeTestTriggerApps +LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) diff --git a/tests/SoundTriggerTestApp/Android.mk b/tests/SoundTriggerTestApp/Android.mk index c327b09568113..73fb5e8eab54c 100644 --- a/tests/SoundTriggerTestApp/Android.mk +++ b/tests/SoundTriggerTestApp/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := SoundTriggerTestApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := optional diff --git a/tests/SoundTriggerTests/Android.mk b/tests/SoundTriggerTests/Android.mk index 359484ee63d71..774fc85eb80e0 100644 --- a/tests/SoundTriggerTests/Android.mk +++ b/tests/SoundTriggerTests/Android.mk @@ -31,5 +31,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := SoundTriggerTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/Split/Android.mk b/tests/Split/Android.mk index b068bef587855..4d15b2d4bd017 100644 --- a/tests/Split/Android.mk +++ b/tests/Split/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := Split +LOCAL_SDK_VERSION := current LOCAL_PACKAGE_SPLITS := mdpi-v4 hdpi-v4 xhdpi-v4 xxhdpi-v4 diff --git a/tests/StatusBar/Android.mk b/tests/StatusBar/Android.mk index 502657f4e260c..e845335684bc9 100644 --- a/tests/StatusBar/Android.mk +++ b/tests/StatusBar/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := StatusBarTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/SystemUIDemoModeController/Android.mk b/tests/SystemUIDemoModeController/Android.mk index 64ea63ce05de4..cc6fa8dfb5f7d 100644 --- a/tests/SystemUIDemoModeController/Android.mk +++ b/tests/SystemUIDemoModeController/Android.mk @@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := DemoModeController +LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) diff --git a/tests/TouchLatency/Android.mk b/tests/TouchLatency/Android.mk index 969283df4af7a..2334bd84c1f29 100644 --- a/tests/TouchLatency/Android.mk +++ b/tests/TouchLatency/Android.mk @@ -15,6 +15,7 @@ LOCAL_AAPT_FLAGS := \ --auto-add-overlay LOCAL_PACKAGE_NAME := TouchLatency +LOCAL_SDK_VERSION := current LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/tests/TransformTest/Android.mk b/tests/TransformTest/Android.mk index 2d3637da569a3..5340cdd5f29b3 100644 --- a/tests/TransformTest/Android.mk +++ b/tests/TransformTest/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := TransformTest +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests diff --git a/tests/TransitionTests/Android.mk b/tests/TransitionTests/Android.mk index 22fa63889261e..a696156d1ee8a 100644 --- a/tests/TransitionTests/Android.mk +++ b/tests/TransitionTests/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := TransitionTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_STATIC_JAVA_LIBRARIES += android-common diff --git a/tests/TtsTests/Android.mk b/tests/TtsTests/Android.mk index 3c3cd77813f74..4fee739988af0 100644 --- a/tests/TtsTests/Android.mk +++ b/tests/TtsTests/Android.mk @@ -24,5 +24,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := TtsTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/UsageStatsTest/Android.mk b/tests/UsageStatsTest/Android.mk index 6b5c9998fc069..6735c7c8f7871 100644 --- a/tests/UsageStatsTest/Android.mk +++ b/tests/UsageStatsTest/Android.mk @@ -11,5 +11,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 LOCAL_CERTIFICATE := platform LOCAL_PACKAGE_NAME := UsageStatsTest +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk b/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk index 3137a7338084f..cd7aaedf2bb1f 100644 --- a/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk +++ b/tests/UsbHostExternalManagmentTest/AoapTestDevice/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := AoapTestDeviceApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) diff --git a/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk b/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk index 354e8c9b7bf43..bd8a51b69bff8 100644 --- a/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk +++ b/tests/UsbHostExternalManagmentTest/AoapTestHost/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := AoapTestHostApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) diff --git a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk index 2d6d6ea8cdcca..fed454eb9d01f 100644 --- a/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk +++ b/tests/UsbHostExternalManagmentTest/UsbHostExternalManagmentTestApp/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := UsbHostExternalManagementTestApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVILEGED_MODULE := true # TODO remove tests tag diff --git a/tests/UsesFeature2Test/Android.mk b/tests/UsesFeature2Test/Android.mk index cc784d7944aa4..4cba4ff62dd4b 100644 --- a/tests/UsesFeature2Test/Android.mk +++ b/tests/UsesFeature2Test/Android.mk @@ -19,6 +19,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := UsesFeature2Test +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests diff --git a/tests/VectorDrawableTest/Android.mk b/tests/VectorDrawableTest/Android.mk index dd8a4d474ae28..155b2bc8560ca 100644 --- a/tests/VectorDrawableTest/Android.mk +++ b/tests/VectorDrawableTest/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := VectorDrawableTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/tests/VoiceEnrollment/Android.mk b/tests/VoiceEnrollment/Android.mk index 2ab3d029092f6..725e2bdd74e5d 100644 --- a/tests/VoiceEnrollment/Android.mk +++ b/tests/VoiceEnrollment/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := VoiceEnrollment +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := optional diff --git a/tests/VoiceInteraction/Android.mk b/tests/VoiceInteraction/Android.mk index 8decca7d163f1..aa48b42d57ca7 100644 --- a/tests/VoiceInteraction/Android.mk +++ b/tests/VoiceInteraction/Android.mk @@ -6,5 +6,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := VoiceInteraction +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/WallpaperTest/Android.mk b/tests/WallpaperTest/Android.mk index b4259cd2782b6..4815500b68e66 100644 --- a/tests/WallpaperTest/Android.mk +++ b/tests/WallpaperTest/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_PACKAGE_NAME := WallpaperTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/WindowManagerStressTest/Android.mk b/tests/WindowManagerStressTest/Android.mk index e4cbe939e5216..6f4403fa86c7b 100644 --- a/tests/WindowManagerStressTest/Android.mk +++ b/tests/WindowManagerStressTest/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := WindowManagerStressTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := tests diff --git a/tests/appwidgets/AppWidgetHostTest/Android.mk b/tests/appwidgets/AppWidgetHostTest/Android.mk index 4d0c704fc812a..c9e6c6b42b5bd 100644 --- a/tests/appwidgets/AppWidgetHostTest/Android.mk +++ b/tests/appwidgets/AppWidgetHostTest/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := AppWidgetHostTest +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/appwidgets/AppWidgetProviderTest/Android.mk b/tests/appwidgets/AppWidgetProviderTest/Android.mk index 6084fb907c076..b26c60b38d4aa 100644 --- a/tests/appwidgets/AppWidgetProviderTest/Android.mk +++ b/tests/appwidgets/AppWidgetProviderTest/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := AppWidgetProvider +LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk index 202a699c1706f..e9618300fc48e 100644 --- a/tests/backup/Android.mk +++ b/tests/backup/Android.mk @@ -40,6 +40,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := BackupTest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PROGUARD_ENABLED := disabled diff --git a/tests/permission/Android.mk b/tests/permission/Android.mk index 54688c8910466..fb84bcf74efa0 100644 --- a/tests/permission/Android.mk +++ b/tests/permission/Android.mk @@ -10,6 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test LOCAL_PACKAGE_NAME := FrameworkPermissionTests +LOCAL_PRIVATE_PLATFORM_APIS := true include $(BUILD_PACKAGE) diff --git a/tests/testables/tests/Android.mk b/tests/testables/tests/Android.mk index 16fe5351c1614..4ec1b0ff1d8ba 100644 --- a/tests/testables/tests/Android.mk +++ b/tests/testables/tests/Android.mk @@ -19,6 +19,7 @@ LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := tests LOCAL_PACKAGE_NAME := TestablesTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-Iaidl-files-under, src) diff --git a/tests/utils/DummyIME/Android.mk b/tests/utils/DummyIME/Android.mk index c8d9f87f08860..0f6c988b5463f 100644 --- a/tests/utils/DummyIME/Android.mk +++ b/tests/utils/DummyIME/Android.mk @@ -22,5 +22,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := DummyIME +LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE)