Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -5,6 +5,8 @@ LOCAL_MODULE_TAGS := tests
|
||||
|
||||
LOCAL_PACKAGE_NAME := OverlayTest
|
||||
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
|
||||
LOCAL_DEX_PREOPT := false
|
||||
|
||||
LOCAL_JAVA_LIBRARIES += legacy-test
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
|
||||
LOCAL_JACK_FLAGS := --multi-dex native
|
||||
|
||||
LOCAL_PACKAGE_NAME := SettingsLibTests
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES := \
|
||||
|
||||
@@ -21,6 +21,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
|
||||
|
||||
@@ -48,6 +48,7 @@ LOCAL_JAVA_LIBRARIES := telephony-common
|
||||
LOCAL_JAVA_LIBRARIES += android.car
|
||||
|
||||
LOCAL_PACKAGE_NAME := SystemUI
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_CERTIFICATE := platform
|
||||
LOCAL_PRIVILEGED_MODULE := true
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) \
|
||||
|
||||
@@ -24,6 +24,7 @@ LOCAL_JAVA_LIBRARIES := \
|
||||
android.test.runner
|
||||
|
||||
LOCAL_PACKAGE_NAME := FrameworksNetTests
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||
|
||||
LOCAL_CERTIFICATE := platform
|
||||
|
||||
@@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_USE_AAPT2 := true
|
||||
LOCAL_PACKAGE_NAME := AaptTestAppOne
|
||||
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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_USE_AAPT2 := true
|
||||
LOCAL_MODULE := AaptTestStaticLibOne
|
||||
LOCAL_SDK_VERSION := current
|
||||
LOCAL_MODULE_TAGS := tests
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under,src)
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
|
||||
|
||||
@@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_USE_AAPT2 := true
|
||||
LOCAL_MODULE := AaptTestStaticLibTwo
|
||||
LOCAL_SDK_VERSION := current
|
||||
LOCAL_MODULE_TAGS := tests
|
||||
LOCAL_SRC_FILES := $(call all-java-files-under,src)
|
||||
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -60,6 +60,7 @@ LOCAL_JAVA_LIBRARIES := \
|
||||
android.test.runner \
|
||||
|
||||
LOCAL_PACKAGE_NAME := FrameworksWifiApiTests
|
||||
LOCAL_PRIVATE_PLATFORM_APIS := true
|
||||
LOCAL_COMPATIBILITY_SUITE := device-tests
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
Reference in New Issue
Block a user