Snap for 8466163 from 30fecb3f57642216e2d030a5a9fb2f811bcf3a28 to main-cg-testing-release

Change-Id: Id06f6ff3da54caa26cb7203a588edf5c5ac60abe
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
index fc42116..a6db277 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 redfin,$(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 f95e98f..d87db8e 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/redfin,:qcom,legacy_proprietary,proprietary,vendor/qcom/redfin/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/qcom/redfin,.jar,legacy_proprietary,proprietary,vendor/qcom/redfin/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/qcom/redfin,.xml,legacy_proprietary,proprietary,vendor/qcom/redfin/LICENSE,))
+
 ifneq ($(filter redfin, $(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)