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." into pi-dev

Browse Source 
am: d740e43bf7

Change-Id: I938efe7a2359302cbf4d5d6f786f963044e1bbbd
This commit is contained in:
Anton Hansson
2018-03-07 14:04:51 +00:00
committed by android-build-merger
parent 19d708a0e6 d740e43bf7
commit ed972116bb
30 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/statsd/tools/dogfood/Android.mk
View File

@@ -17,6 +17,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := StatsdDogfood LOCAL_PACKAGE_NAME := StatsdDogfood
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

1
cmds/statsd/tools/loadtest/Android.mk
View File

@@ -17,6 +17,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := StatsdLoadtest LOCAL_PACKAGE_NAME := StatsdLoadtest
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)

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

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

@@ -12,6 +12,7 @@ LOCAL_DX_FLAGS := --core-library
LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib android-support-test
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests LOCAL_PACKAGE_NAME := FrameworksCoreFeatureFlagTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests

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

@@ -31,6 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test android-support-test
LOCAL_PACKAGE_NAME := WebViewLoadingTests LOCAL_PACKAGE_NAME := WebViewLoadingTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests

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 android.test.base
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_USE_AAPT2 := true LOCAL_USE_AAPT2 := true

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

@@ -19,6 +19,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/SimAppDialog/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 := SimAppDialog LOCAL_PACKAGE_NAME := SimAppDialog
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

1
packages/SystemUI/Android.mk
View File

@@ -58,6 +58,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_JAVA_LIBRARIES := telephony-common
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/shared/Android.mk
View File

@@ -31,6 +31,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := SysUISharedLib LOCAL_PACKAGE_NAME := SysUISharedLib
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 := SystemUISharedLib LOCAL_JAVA_LIBRARIES := SystemUISharedLib

1
packages/SystemUI/shared/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 := SystemUISharedLibTests LOCAL_PACKAGE_NAME := SystemUISharedLibTests
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests LOCAL_COMPATIBILITY_SUITE := device-tests
# Add local path sources as well as shared lib sources # Add local path sources as well as shared lib sources

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
services/robotests/Android.mk
View File

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

1
tests/AppLaunchWear/Android.mk
View File

@@ -7,6 +7,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := AppLaunchWear LOCAL_PACKAGE_NAME := AppLaunchWear
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform
LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner LOCAL_JAVA_LIBRARIES := android.test.base android.test.runner

1
tests/net/Android.mk
View File

@@ -26,6 +26,7 @@ LOCAL_JAVA_LIBRARIES := \
android.test.mock android.test.mock
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/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/BasicTest/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 := AaptBasicTest LOCAL_PACKAGE_NAME := AaptBasicTest
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

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

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_AAPT_NAMESPACES := true LOCAL_AAPT_NAMESPACES := true
LOCAL_PACKAGE_NAME := AaptTestNamespace_App LOCAL_PACKAGE_NAME := AaptTestNamespace_App
LOCAL_SDK_VERSION := current
LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_EXPORT_PACKAGE_RESOURCES := true
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)

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

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_AAPT_NAMESPACES := true LOCAL_AAPT_NAMESPACES := true
LOCAL_MODULE := AaptTestNamespace_LibOne LOCAL_MODULE := AaptTestNamespace_LibOne
LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

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

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_AAPT_NAMESPACES := true LOCAL_AAPT_NAMESPACES := true
LOCAL_MODULE := AaptTestNamespace_LibTwo LOCAL_MODULE := AaptTestNamespace_LibTwo
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/NamespaceTest/Split/Android.mk
View File

@@ -20,6 +20,7 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_AAPT_NAMESPACES := true LOCAL_AAPT_NAMESPACES := true
LOCAL_PACKAGE_NAME := AaptTestNamespace_Split LOCAL_PACKAGE_NAME := AaptTestNamespace_Split
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_APK_LIBRARIES := AaptTestNamespace_App LOCAL_APK_LIBRARIES := AaptTestNamespace_App

1
tools/aapt2/integration-tests/StaticLibTest/App/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 := AaptTestStaticLib_App LOCAL_PACKAGE_NAME := AaptTestStaticLib_App
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/StaticLibTest/LibOne/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 := AaptTestStaticLib_LibOne LOCAL_MODULE := AaptTestStaticLib_LibOne
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/StaticLibTest/LibTwo/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 := AaptTestStaticLib_LibTwo LOCAL_MODULE := AaptTestStaticLib_LibTwo
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

@@ -61,6 +61,7 @@ LOCAL_JAVA_LIBRARIES := \
android.test.base \ android.test.base \
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)