Non-module targets. am: bb1c166526

Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2063379

Change-Id: I60cc0332dfe8bf3a7bf97ab1cc0621189e26a808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
index 339e800..5caef36 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 a9a3678..510d07a 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/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,))
diff --git a/self-extractors_sargo/google_devices/staging/Android.mk b/self-extractors_sargo/google_devices/staging/Android.mk
index eeae071..814ce95 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 e73075c..346dc40 100644
--- a/self-extractors_sargo/qcom/staging/Android.mk
+++ b/self-extractors_sargo/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/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,))