Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09ad1cbd authored Mar 01, 2018 by Anton Hansson Committed by android-build-merger Mar 01, 2018

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

am: 9ee9e6b2

Change-Id: I984b5ee633078401769d3c649aa9b020715772df

parents 669194a8 9ee9e6b2

apct-tests/perftests/core/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

apct-tests/perftests/multiuser/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-test

		LOCAL_PACKAGE_NAME := MultiUserPerfTests
		LOCAL_PRIVATE_PLATFORM_APIS := true

		LOCAL_CERTIFICATE := platform

core/tests/BTtraffic/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/res

		LOCAL_PACKAGE_NAME := bttraffic
		LOCAL_SDK_VERSION := current
		LOCAL_CERTIFICATE := platform

		include $(BUILD_PACKAGE)

core/tests/ConnectivityManagerTest/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

core/tests/SvcMonitor/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ LOCAL_RESOURCE_DIR := \
		$(LOCAL_PATH)/res

		LOCAL_PACKAGE_NAME := svcmonitor
		LOCAL_SDK_VERSION := current
		LOCAL_CERTIFICATE := platform

		include $(BUILD_PACKAGE)