diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-18 07:00:36 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-18 07:00:36 +0000 |
| commit | 9209f45e18fbe261bce85aee3ff06e94ca744044 (patch) | |
| tree | b41162d2211961910821bfbd9f63b0d8c584def7 | |
| parent | c06cf661f3b885e6b7c094e857564211219b1b95 (diff) | |
| parent | bb1c16652690df55d3976f3ca6c5f00c2c72d012 (diff) | |
| download | bonito-9209f45e18fbe261bce85aee3ff06e94ca744044.tar.gz | |
Snap for 8466163 from bb1c16652690df55d3976f3ca6c5f00c2c72d012 to main-cg-testing-release
Change-Id: I990dddec1a85b719334e61f659c1b78e23c54d4e
| -rw-r--r-- | self-extractors/google_devices/staging/Android.mk | 4 | ||||
| -rw-r--r-- | self-extractors/qcom/staging/Android.mk | 6 | ||||
| -rw-r--r-- | self-extractors_sargo/google_devices/staging/Android.mk | 4 | ||||
| -rw-r--r-- | self-extractors_sargo/qcom/staging/Android.mk | 6 |
4 files changed, 20 insertions, 0 deletions
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk index 339e8009..5caef362 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk @@ -16,7 +16,11 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + ifneq ($(filter bonito,$(TARGET_DEVICE)),) $(call add-radio-file,bootloader.img) + $(call declare-license-metadata,$(LOCAL_PATH)/bootloader.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Bootloader Image",vendor) $(call add-radio-file,radio.img) + $(call declare-license-metadata,$(LOCAL_PATH)/radio.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Radio Image",vendor) endif diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk index 039e9118..510d07a7 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk @@ -1,5 +1,11 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,:qcom,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.jar,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.xml,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) + ifneq ($(filter bonito, $(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) diff --git a/self-extractors_sargo/google_devices/staging/Android.mk b/self-extractors_sargo/google_devices/staging/Android.mk index eeae0715..814ce95d 100644 --- a/self-extractors_sargo/google_devices/staging/Android.mk +++ b/self-extractors_sargo/google_devices/staging/Android.mk @@ -16,7 +16,11 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + ifneq ($(filter sargo,$(TARGET_DEVICE)),) $(call add-radio-file,bootloader.img) + $(call declare-license-metadata,$(LOCAL_PATH)/bootloader.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Bootloader Image",vendor) $(call add-radio-file,radio.img) + $(call declare-license-metadata,$(LOCAL_PATH)/radio.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Radio Image",vendor) endif diff --git a/self-extractors_sargo/qcom/staging/Android.mk b/self-extractors_sargo/qcom/staging/Android.mk index ce5244e0..346dc40c 100644 --- a/self-extractors_sargo/qcom/staging/Android.mk +++ b/self-extractors_sargo/qcom/staging/Android.mk @@ -1,5 +1,11 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,:qcom,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.jar,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.xml,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) + ifneq ($(filter sargo, $(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) |