summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-04-14 22:44:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-14 22:44:11 +0000
commitbc9785b87b7fd758b6ee94b3507c8a142a47b6a8 (patch)
tree2ef0b78ed21a888b51677ced0d569bf970c73b23
parent1a0a76976b0d8fde1d3cb34c8c151728ac24e03d (diff)
parent351fe11106081de5c4203cb5ce35e9f90353e8f9 (diff)
downloadbramble-bc9785b87b7fd758b6ee94b3507c8a142a47b6a8.tar.gz
Non-module targets. am: 8dcef9c129 am: 351fe11106
Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2063427 Change-Id: I735f942d5165a9268255a8e88ab891d95711eaf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--self-extractors/google_devices/staging/Android.mk4
-rw-r--r--self-extractors/qcom/staging/Android.mk2
2 files changed, 6 insertions, 0 deletions
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
index ed499db..3ea4e1c 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 bramble,$(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 8af890f..d4ca6ee 100644
--- a/self-extractors/qcom/staging/Android.mk
+++ b/self-extractors/qcom/staging/Android.mk
@@ -1,5 +1,7 @@
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/bramble,:qcom,legacy_proprietary,proprietary,vendor/qcom/bramble/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bramble,.jar,legacy_proprietary,proprietary,vendor/qcom/bramble/LICENSE,))
$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bramble,.xml,legacy_proprietary,proprietary,vendor/qcom/bramble/LICENSE,))