From fac5b05a41a56d1f8e0b70deb3e88983c2738585 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 12 Apr 2022 17:22:32 -0700 Subject: [PATCH] Non-module targets. Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I229f692e11eec9fa5a9beffd9d6ba811c378e82e --- self-extractors_oriole/google_devices/staging/Android.mk | 8 ++++++++ self-extractors_raven/google_devices/staging/Android.mk | 8 ++++++++ 2 files changed, 16 insertions(+) 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) 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)