Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
Change-Id: Idfcfd64cf47aaf2cc2a06ae199b1085b54ee3652
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index e1ef669..5a05c40 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-ifdef PHONE_CAR_BOARD_CONFIG
- include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+ include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := oriole
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index c3f2cc7..4ff656e 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -14,8 +14,8 @@
# limitations under the License.
#
-ifdef PHONE_CAR_BOARD_CONFIG
- include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+ include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := raven
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)