diff options
30 files changed, 30 insertions, 0 deletions
diff --git a/cmds/statsd/tools/dogfood/Android.mk b/cmds/statsd/tools/dogfood/Android.mk index c7e4c7b71793..baf235bb91be 100644 --- a/cmds/statsd/tools/dogfood/Android.mk +++ b/cmds/statsd/tools/dogfood/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := StatsdDogfood +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/cmds/statsd/tools/loadtest/Android.mk b/cmds/statsd/tools/loadtest/Android.mk index 091f184ad304..219cd9525bbd 100644 --- a/cmds/statsd/tools/loadtest/Android.mk +++ b/cmds/statsd/tools/loadtest/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := StatsdLoadtest +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/core/tests/BroadcastRadioTests/Android.mk b/core/tests/BroadcastRadioTests/Android.mk index 8df3827935aa..24f0cf07f443 100644 --- a/core/tests/BroadcastRadioTests/Android.mk +++ b/core/tests/BroadcastRadioTests/Android.mk @@ -23,6 +23,7 @@ LOCAL_CERTIFICATE := platform LOCAL_MODULE_TAGS := tests # TODO(b/13282254): uncomment when b/13282254 is fixed # LOCAL_SDK_VERSION := current +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng diff --git a/core/tests/featureflagtests/Android.mk b/core/tests/featureflagtests/Android.mk index 6330b8eb4183..5e518b60a9ee 100644 --- a/core/tests/featureflagtests/Android.mk +++ b/core/tests/featureflagtests/Android.mk @@ -12,6 +12,7 @@ LOCAL_DX_FLAGS := --core-library LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/core/tests/webkit/Android.mk b/core/tests/webkit/Android.mk index cd0c3d25a68b..45f6957c10e7 100644 --- a/core/tests/webkit/Android.mk +++ b/core/tests/webkit/Android.mk @@ -31,6 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test LOCAL_PACKAGE_NAME := WebViewLoadingTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_COMPATIBILITY_SUITE := device-tests diff --git a/packages/CaptivePortalLogin/Android.mk b/packages/CaptivePortalLogin/Android.mk index 576debc6478d..e6e0ad33c801 100644 --- a/packages/CaptivePortalLogin/Android.mk +++ b/packages/CaptivePortalLogin/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CaptivePortalLogin +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/packages/CarrierDefaultApp/Android.mk b/packages/CarrierDefaultApp/Android.mk index 82be13260659..df88afdcf041 100644 --- a/packages/CarrierDefaultApp/Android.mk +++ b/packages/CarrierDefaultApp/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CarrierDefaultApp +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) diff --git a/packages/CarrierDefaultApp/tests/unit/Android.mk b/packages/CarrierDefaultApp/tests/unit/Android.mk index 6e120a6355e8..8e3785e7bda8 100644 --- a/packages/CarrierDefaultApp/tests/unit/Android.mk +++ b/packages/CarrierDefaultApp/tests/unit/Android.mk @@ -27,6 +27,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test mockito-target-minus-junit4 LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CarrierDefaultAppUnitTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_INSTRUMENTATION_FOR := CarrierDefaultApp diff --git a/packages/SettingsLib/tests/integ/Android.mk b/packages/SettingsLib/tests/integ/Android.mk index cfb3519df77c..c893b6dcffbf 100644 --- a/packages/SettingsLib/tests/integ/Android.mk +++ b/packages/SettingsLib/tests/integ/Android.mk @@ -25,6 +25,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common android.test.base LOCAL_JACK_FLAGS := --multi-dex native LOCAL_PACKAGE_NAME := SettingsLibTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_USE_AAPT2 := true diff --git a/packages/SettingsLib/tests/robotests/Android.mk b/packages/SettingsLib/tests/robotests/Android.mk index f5c42b68e32b..d15a3ef2946d 100644 --- a/packages/SettingsLib/tests/robotests/Android.mk +++ b/packages/SettingsLib/tests/robotests/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := SettingsLibShell +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := optional LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/SimAppDialog/Android.mk b/packages/SimAppDialog/Android.mk index 00a2e60b29f4..6a4099bcc637 100644 --- a/packages/SimAppDialog/Android.mk +++ b/packages/SimAppDialog/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := SimAppDialog +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk index 1e48213c42d8..f65efb893e34 100644 --- a/packages/SystemUI/Android.mk +++ b/packages/SystemUI/Android.mk @@ -58,6 +58,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_PACKAGE_NAME := SystemUI +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_PRIVILEGED_MODULE := true diff --git a/packages/SystemUI/plugin/Android.mk b/packages/SystemUI/plugin/Android.mk index e22dddb6d565..8634684087e2 100644 --- a/packages/SystemUI/plugin/Android.mk +++ b/packages/SystemUI/plugin/Android.mk @@ -32,6 +32,7 @@ include $(CLEAR_VARS) # Dummy to generate .toc files. LOCAL_PACKAGE_NAME := PluginDummyLib +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := SystemUIPluginLib diff --git a/packages/SystemUI/shared/Android.mk b/packages/SystemUI/shared/Android.mk index 21b0ed85a420..f20df0cebc8d 100644 --- a/packages/SystemUI/shared/Android.mk +++ b/packages/SystemUI/shared/Android.mk @@ -31,6 +31,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := SysUISharedLib +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_JAVA_LIBRARIES := SystemUISharedLib diff --git a/packages/SystemUI/shared/tests/Android.mk b/packages/SystemUI/shared/tests/Android.mk index d01160d95e9d..4e7cbbfede2b 100644 --- a/packages/SystemUI/shared/tests/Android.mk +++ b/packages/SystemUI/shared/tests/Android.mk @@ -26,6 +26,7 @@ LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/.. LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors LOCAL_PACKAGE_NAME := SystemUISharedLibTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests # Add local path sources as well as shared lib sources diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk index 552784aa88db..ebb088be8171 100644 --- a/packages/SystemUI/tests/Android.mk +++ b/packages/SystemUI/tests/Android.mk @@ -26,6 +26,7 @@ LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/.. LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors LOCAL_PACKAGE_NAME := SystemUITests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_SRC_FILES := $(call all-java-files-under, src) \ diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk index cd8163dd4852..aed57e3b6dcc 100644 --- a/services/robotests/Android.mk +++ b/services/robotests/Android.mk @@ -21,6 +21,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := FrameworksServicesLib +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_MODULE_TAGS := optional LOCAL_PRIVILEGED_MODULE := true diff --git a/tests/AppLaunchWear/Android.mk b/tests/AppLaunchWear/Android.mk index ac123e79bcd9..6d083661324d 100644 --- a/tests/AppLaunchWear/Android.mk +++ b/tests/AppLaunchWear/Android.mk @@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := AppLaunchWear +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner diff --git a/tests/net/Android.mk b/tests/net/Android.mk index 9130e7db80a1..1bc4fd5ec582 100644 --- a/tests/net/Android.mk +++ b/tests/net/Android.mk @@ -26,6 +26,7 @@ LOCAL_JAVA_LIBRARIES := \ android.test.mock LOCAL_PACKAGE_NAME := FrameworksNetTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_CERTIFICATE := platform diff --git a/tools/aapt2/integration-tests/AutoVersionTest/Android.mk b/tools/aapt2/integration-tests/AutoVersionTest/Android.mk index 012728f1c18f..03cce3534a4e 100644 --- a/tools/aapt2/integration-tests/AutoVersionTest/Android.mk +++ b/tools/aapt2/integration-tests/AutoVersionTest/Android.mk @@ -19,5 +19,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := AaptAutoVersionTest +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests include $(BUILD_PACKAGE) diff --git a/tools/aapt2/integration-tests/BasicTest/Android.mk b/tools/aapt2/integration-tests/BasicTest/Android.mk index 6d2aac6ac936..d1605540371e 100644 --- a/tools/aapt2/integration-tests/BasicTest/Android.mk +++ b/tools/aapt2/integration-tests/BasicTest/Android.mk @@ -19,5 +19,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := AaptBasicTest +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests include $(BUILD_PACKAGE) diff --git a/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk index 2da294ce88ad..446237412370 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_PACKAGE_NAME := AaptTestNamespace_App +LOCAL_SDK_VERSION := current LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) diff --git a/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk index b1cac68dae7a..021185f8448b 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/LibOne/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_MODULE := AaptTestNamespace_LibOne +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk index dc16d1bbb420..39bd481a0714 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/LibTwo/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_MODULE := AaptTestNamespace_LibTwo +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk index a35f6edd77a5..83e2289430f7 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_PACKAGE_NAME := AaptTestNamespace_Split +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_APK_LIBRARIES := AaptTestNamespace_App diff --git a/tools/aapt2/integration-tests/StaticLibTest/App/Android.mk b/tools/aapt2/integration-tests/StaticLibTest/App/Android.mk index 4d0c01d565a5..3cce35de6a31 100644 --- a/tools/aapt2/integration-tests/StaticLibTest/App/Android.mk +++ b/tools/aapt2/integration-tests/StaticLibTest/App/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := AaptTestStaticLib_App +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets $(LOCAL_PATH)/assets2 diff --git a/tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.mk b/tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.mk index 0c828b80b3b3..da25f6477b08 100644 --- a/tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.mk +++ b/tools/aapt2/integration-tests/StaticLibTest/LibOne/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE := AaptTestStaticLib_LibOne +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.mk b/tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.mk index 538d5251b203..27a3134e6ffa 100644 --- a/tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.mk +++ b/tools/aapt2/integration-tests/StaticLibTest/LibTwo/Android.mk @@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_MODULE := AaptTestStaticLib_LibTwo +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res diff --git a/tools/aapt2/integration-tests/SymlinkTest/Android.mk b/tools/aapt2/integration-tests/SymlinkTest/Android.mk index 902fc65a667f..8da1141df7b3 100644 --- a/tools/aapt2/integration-tests/SymlinkTest/Android.mk +++ b/tools/aapt2/integration-tests/SymlinkTest/Android.mk @@ -19,5 +19,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := AaptSymlinkTest +LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests include $(BUILD_PACKAGE) diff --git a/wifi/tests/Android.mk b/wifi/tests/Android.mk index d9f332f2f3bd..2cb45514e061 100644 --- a/wifi/tests/Android.mk +++ b/wifi/tests/Android.mk @@ -61,6 +61,7 @@ LOCAL_JAVA_LIBRARIES := \ android.test.base \ LOCAL_PACKAGE_NAME := FrameworksWifiApiTests +LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_COMPATIBILITY_SUITE := device-tests include $(BUILD_PACKAGE) |