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

Commit 9ee9e6b2 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

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

am: c164c831

Change-Id: Icd753634a498a9c1a2d2e27ad4e6cd788e7b9e1f
parents 773523a6 c164c831

apct-tests/perftests/core/Android.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    legacy-android-test

    legacy-android-test





LOCAL_PACKAGE_NAME := CorePerfTests

LOCAL_PACKAGE_NAME := CorePerfTests

LOCAL_PRIVATE_PLATFORM_APIS := true





LOCAL_JNI_SHARED_LIBRARIES := libperftestscore_jni

LOCAL_JNI_SHARED_LIBRARIES := libperftestscore_jni

apct-tests/perftests/multiuser/Android.mk

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

    android-support-test





LOCAL_PACKAGE_NAME := MultiUserPerfTests

LOCAL_PACKAGE_NAME := MultiUserPerfTests

LOCAL_PRIVATE_PLATFORM_APIS := true





LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform

core/tests/BTtraffic/Android.mk

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

    $(LOCAL_PATH)/res





LOCAL_PACKAGE_NAME := bttraffic

LOCAL_PACKAGE_NAME := bttraffic

LOCAL_SDK_VERSION := current

LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform





include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)

core/tests/ConnectivityManagerTest/Android.mk

+1 −0
Original line number Original line 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_SRC_FILES := $(call all-java-files-under, src)





LOCAL_PACKAGE_NAME := ConnectivityManagerTest

LOCAL_PACKAGE_NAME := ConnectivityManagerTest

LOCAL_PRIVATE_PLATFORM_APIS := true





LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform

core/tests/SvcMonitor/Android.mk

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

    $(LOCAL_PATH)/res





LOCAL_PACKAGE_NAME := svcmonitor

LOCAL_PACKAGE_NAME := svcmonitor

LOCAL_SDK_VERSION := current

LOCAL_CERTIFICATE := platform

LOCAL_CERTIFICATE := platform





include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)