Skip to content

Commit

Permalink
[LSC] Add LOCAL_LICENSE_KINDS to device/google/sunfish am: d58c172
Browse files Browse the repository at this point in the history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/13841885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I943351a0101643b890d175a21072d9f16f1f081e
  • Loading branch information
bbadour authored and android-build-merge-worker-robot committed Mar 12, 2021
2 parents 9351df0 + d58c172 commit 2a4261a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dumpstate/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := [email protected]
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_INIT_RC := [email protected]
LOCAL_MODULE_RELATIVE_PATH := hw

Expand Down
3 changes: 3 additions & 0 deletions json-c/Android.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
LIBJSON_ROOT := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libjson
LOCAL_LICENSE_KINDS := legacy_notice
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_PATH := $(LIBJSON_ROOT)
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/COPYING
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
LOCAL_COPY_HEADERS_TO := libjson/inc
Expand Down
9 changes: 9 additions & 0 deletions self-extractors/qcom/staging/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ ifneq ($(filter sunfish, $(TARGET_DEVICE)),)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := ims
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
Expand All @@ -17,6 +20,9 @@ include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := qcrilmsgtunnel
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
Expand All @@ -30,6 +36,9 @@ include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
LOCAL_MODULE := QtiTelephonyService
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
LOCAL_MODULE_TAGS := optional
LOCAL_BUILT_MODULE_STEM := package.apk
LOCAL_SYSTEM_EXT_MODULE := true
Expand Down

0 comments on commit 2a4261a

Please sign in to comment.