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

Commit 3be35ec2 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" am: 541d0855 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1587746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc96bfa8a3d59a19194a154baeaffaea1281af0a
parents d7927e46 541d0855

Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -12,6 +12,23 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["packages_apps_Launcher3_license"],

}



// Added automatically by a large-scale-change

// See: http://go/android-license-faq

license {

    name: "packages_apps_Launcher3_license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

    ],

    license_text: [

        "NOTICE",

    ],

}



android_library {

    name: "launcher-aosp-tapl",

    static_libs: [

Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java 
LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MODULE := Launcher3CommonDepsLib

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE

LOCAL_PRIVILEGED_MODULE := true

LOCAL_MANIFEST_FILE := AndroidManifest-common.xml
@@ -143,6 +146,9 @@ else 
  LOCAL_MIN_SDK_VERSION := 26

endif

LOCAL_MODULE := Launcher3QuickStepLib

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

LOCAL_LICENSE_CONDITIONS := notice

LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE

LOCAL_PRIVILEGED_MODULE := true

LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib

robolectric_tests/Android.mk

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_MODULE := LauncherRoboTests

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

LOCAL_LICENSE_CONDITIONS := notice

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

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



LOCAL_SDK_VERSION := system_current
@@ -50,6 +53,9 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_MODULE := RunLauncherRoboTests

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

LOCAL_LICENSE_CONDITIONS := notice

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

LOCAL_SDK_VERSION := system_current

LOCAL_JAVA_LIBRARIES := LauncherRoboTests

tests/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ else 
endif



LOCAL_MODULE := ub-launcher-aosp-tapl

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

LOCAL_LICENSE_CONDITIONS := notice

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

LOCAL_SDK_VERSION := system_current



include $(BUILD_STATIC_JAVA_LIBRARY)