commit 0b98b4ff78f79dbe84eb96d3359a41a7f0d94e21
author Bob Badour <bbadour@google.com> Thu Apr 14 22:27:07 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 14 22:27:07 2022 +0000
tree 8cc98b4cd3ca362116af3f0aae4d5ead3b4297d6
parent 5018ef0b5493d3b2c789d4c16abb022309074b5b
parent fac5b05a41a56d1f8e0b70deb3e88983c2738585

Non-module targets. am: fac5b05a41

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I56c264ce196330c586c584fd3aec8c62364094d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

self-extractors_oriole/google_devices/staging/Android.mk

diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk
index 11ff079..5ae0f03 100644
--- a/self-extractors_oriole/google_devices/staging/Android.mk
+++ b/self-extractors_oriole/google_devices/staging/Android.mk
@@ -16,11 +16,19 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor)
+
 ifneq ($(filter oriole,$(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
 
+$(eval $(call declare-copy-files-license-metadata,vendor/google_devices/oriole,:samsung,legacy_proprietary,proprietary,vendor/google_devices/oriole/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/google_devices/oriole,.jar,legacy_proprietary,proprietary,vendor/google_devices/oriole/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/google_devices/oriole,.xml,legacy_proprietary,proprietary,vendor/google_devices/oriole/LICENSE,))
+
 ifneq ($(filter oriole,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)

self-extractors_raven/google_devices/staging/Android.mk

diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk
index e4984fd..54f01eb 100644
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk
@@ -16,11 +16,19 @@
 
 LOCAL_PATH := $(call my-dir)
 
+$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor)
+
 ifneq ($(filter raven,$(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
 
+$(eval $(call declare-copy-files-license-metadata,vendor/google_devices/raven,:samsung,legacy_proprietary,proprietary,vendor/google_devices/raven/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/google_devices/raven,.jar,legacy_proprietary,proprietary,vendor/google_devices/raven/LICENSE,))
+$(eval $(call declare-copy-files-license-metadata,vendor/google_devices/raven,.xml,legacy_proprietary,proprietary,vendor/google_devices/raven/LICENSE,))
+
 ifneq ($(filter raven,$(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)