Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "frameworks/base: Set LOCAL_SDK_VERSION where possible."

Browse Source
This commit is contained in:
Anton Hansson
2018-03-07 16:46:58 +00:00
committed by Gerrit Code Review
parent ecb46b610c be72e62c63
commit 13310fef6e
17 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/tests/BroadcastRadioTests/Android.mk
View File

@@ -23,6 +23,7 @@ LOCAL_CERTIFICATE := platform
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
# TODO(b/13282254): uncomment when b/13282254 is fixed # TODO(b/13282254): uncomment when b/13282254 is fixed
# LOCAL_SDK_VERSION := current # LOCAL_SDK_VERSION := current
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng

2
core/tests/overlaytests/OverlayTest/Android.mk
View File

@@ -5,6 +5,8 @@ LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := OverlayTest LOCAL_PACKAGE_NAME := OverlayTest
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_JAVA_LIBRARIES += legacy-test LOCAL_JAVA_LIBRARIES += legacy-test

1
packages/CaptivePortalLogin/Android.mk
View File

@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CaptivePortalLogin LOCAL_PACKAGE_NAME := CaptivePortalLogin
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
packages/CarrierDefaultApp/Android.mk
View File

@@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CarrierDefaultApp LOCAL_PACKAGE_NAME := CarrierDefaultApp
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
packages/CarrierDefaultApp/tests/unit/Android.mk
View File

@@ -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_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CarrierDefaultAppUnitTests LOCAL_PACKAGE_NAME := CarrierDefaultAppUnitTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_INSTRUMENTATION_FOR := CarrierDefaultApp LOCAL_INSTRUMENTATION_FOR := CarrierDefaultApp

1
packages/SettingsLib/tests/integ/Android.mk
View File

@@ -25,6 +25,7 @@ LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
LOCAL_JACK_FLAGS := --multi-dex native LOCAL_JACK_FLAGS := --multi-dex native
LOCAL_PACKAGE_NAME := SettingsLibTests LOCAL_PACKAGE_NAME := SettingsLibTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \

1
packages/SettingsLib/tests/robotests/Android.mk
View File

@@ -21,6 +21,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SettingsLibShell LOCAL_PACKAGE_NAME := SettingsLibShell
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_PRIVILEGED_MODULE := true LOCAL_PRIVILEGED_MODULE := true

1
packages/SystemUI/Android.mk
View File

@@ -48,6 +48,7 @@ LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_JAVA_LIBRARIES += android.car LOCAL_JAVA_LIBRARIES += android.car
LOCAL_PACKAGE_NAME := SystemUI LOCAL_PACKAGE_NAME := SystemUI
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true LOCAL_PRIVILEGED_MODULE := true

1
packages/SystemUI/plugin/Android.mk
View File

@@ -32,6 +32,7 @@ include $(CLEAR_VARS)
# Dummy to generate .toc files. # Dummy to generate .toc files.
LOCAL_PACKAGE_NAME := PluginDummyLib LOCAL_PACKAGE_NAME := PluginDummyLib
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_JAVA_LIBRARIES := SystemUIPluginLib LOCAL_JAVA_LIBRARIES := SystemUIPluginLib

1
packages/SystemUI/tests/Android.mk
View File

@@ -26,6 +26,7 @@ LOCAL_PROTOC_FLAGS := -I$(LOCAL_PATH)/..
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors LOCAL_PROTO_JAVA_OUTPUT_PARAMS := optional_field_style=accessors
LOCAL_PACKAGE_NAME := SystemUITests LOCAL_PACKAGE_NAME := SystemUITests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) \ LOCAL_SRC_FILES := $(call all-java-files-under, src) \

1
tests/net/Android.mk
View File

@@ -24,6 +24,7 @@ LOCAL_JAVA_LIBRARIES := \
android.test.runner android.test.runner
LOCAL_PACKAGE_NAME := FrameworksNetTests LOCAL_PACKAGE_NAME := FrameworksNetTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

1
tools/aapt2/integration-tests/AppOne/Android.mk
View File

@@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := AaptTestAppOne LOCAL_PACKAGE_NAME := AaptTestAppOne
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets $(LOCAL_PATH)/assets2 LOCAL_ASSET_DIR := $(LOCAL_PATH)/assets $(LOCAL_PATH)/assets2

1
tools/aapt2/integration-tests/AutoVersionTest/Android.mk
View File

@@ -19,5 +19,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := AaptAutoVersionTest LOCAL_PACKAGE_NAME := AaptAutoVersionTest
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
tools/aapt2/integration-tests/StaticLibOne/Android.mk
View File

@@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_MODULE := AaptTestStaticLibOne LOCAL_MODULE := AaptTestStaticLibOne
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

1
tools/aapt2/integration-tests/StaticLibTwo/Android.mk
View File

@@ -19,6 +19,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_MODULE := AaptTestStaticLibTwo LOCAL_MODULE := AaptTestStaticLibTwo
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

1
tools/aapt2/integration-tests/SymlinkTest/Android.mk
View File

@@ -19,5 +19,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := AaptSymlinkTest LOCAL_PACKAGE_NAME := AaptSymlinkTest
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

1
wifi/tests/Android.mk
View File

@@ -60,6 +60,7 @@ LOCAL_JAVA_LIBRARIES := \
android.test.runner \ android.test.runner \
LOCAL_PACKAGE_NAME := FrameworksWifiApiTests LOCAL_PACKAGE_NAME := FrameworksWifiApiTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)