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

Commit 48a93af6 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base am: 268090cd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682054

Change-Id: If40ef54914e5565aa2b535906ddc2cf6763b53e5
parents 33cc3922 268090cd

core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common mockwebserver junit 
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base



LOCAL_PACKAGE_NAME := DownloadManagerTestApp

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE

LOCAL_PRIVATE_PLATFORM_APIS := true



ifneq ($(TARGET_BUILD_VARIANT),user)

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_SDK_VERSION := 8



LOCAL_PACKAGE_NAME := MultiDexLegacyAndException

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE



LOCAL_DEX_PREOPT := false

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_SDK_VERSION := 8



LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE



LOCAL_DEX_PREOPT := false
@@ -59,6 +62,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_SDK_VERSION := 8



LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE



LOCAL_DEX_PREOPT := false

core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_SDK_VERSION := 8



LOCAL_PACKAGE_NAME := MultiDexLegacyTestAppTests

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE



LOCAL_DEX_PREOPT := false

core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_SDK_VERSION := current



LOCAL_PACKAGE_NAME := MultiDexLegacyTestAppTests2

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE



LOCAL_DEX_PREOPT := false
@@ -49,6 +52,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
LOCAL_SDK_VERSION := 8



LOCAL_PACKAGE_NAME := MultiDexLegacyTestAppTests2-multidex

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE  := $(LOCAL_PATH)/../../../../../NOTICE



LOCAL_DEX_PREOPT := false