Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 548592df authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Split system and vendor unmounted notice deps"

parents fe21f99d dd15ec1f

core/Makefile

+20 −19
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ LOCAL_PATH := $(BUILD_SYSTEM) 
SYSTEM_NOTICE_DEPS :=

VENDOR_NOTICE_DEPS :=

UNMOUNTED_NOTICE_DEPS :=

UNMOUNTED_NOTICE_VENDOR_DEPS :=

ODM_NOTICE_DEPS :=

OEM_NOTICE_DEPS :=

PRODUCT_NOTICE_DEPS :=
@@ -902,7 +903,7 @@ endif 
$(call declare-1p-container,$(INSTALLED_RAMDISK_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_RAMDISK_TARGET),$(INTERNAL_RAMDISK_FILE),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_RAMDISK_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_RAMDISK_TARGET)



.PHONY: ramdisk-nodeps

ramdisk-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
@@ -1100,7 +1101,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILE 
$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES) $(INTERNAL_GKI_CERTIFICATE_DEPS),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG) $(AVBTOOL) $(BOARD_AVB_BOOT_KEY_PATH) $(INTERNAL_GKI_CERTIFICATE_DEPS)
@@ -1123,7 +1124,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_ 
$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG) $(VBOOT_SIGNER) $(FUTILITY)
@@ -1145,7 +1146,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) 
$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)



.PHONY: bootimage-nodeps

bootimage-nodeps: $(MKBOOTIMG)
@@ -1175,7 +1176,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE) $(AVBTOOL) $(BOARD 
$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",bool)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_PREBUILT_BOOTIMAGE),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)

else

$(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE)

	cp $(INTERNAL_PREBUILT_BOOTIMAGE) $@
@@ -1223,7 +1224,7 @@ $(INSTALLED_INIT_BOOT_IMAGE_TARGET): 
$(call declare-1p-target,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),)

endif



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_INIT_BOOT_IMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_INIT_BOOT_IMAGE_TARGET)



else # BUILDING_INIT_BOOT_IMAGE is not true
@@ -1249,7 +1250,7 @@ $(INSTALLED_INIT_BOOT_IMAGE_TARGET): $(INTERNAL_PREBUILT_INIT_BOOT_IMAGE) 
$(call declare-1p-target,$(INSTALLED_INIT_BOOT_IMAGE_TARGET),)

endif # BOARD_AVB_ENABLE



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_INIT_BOOT_IMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_INIT_BOOT_IMAGE_TARGET)



else # BOARD_PREBUILT_INIT_BOOT_IMAGE not defined

INSTALLED_INIT_BOOT_IMAGE_TARGET :=
@@ -2476,7 +2477,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps) 
$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",bool)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(recoveryimage-deps),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_BOOTIMAGE_TARGET)

endif # BOARD_USES_RECOVERY_AS_BOOT



$(INSTALLED_RECOVERYIMAGE_TARGET): $(recoveryimage-deps)
@@ -2494,7 +2495,7 @@ endif 
$(call declare-1p-container,$(INSTALLED_RECOVERYIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_RECOVERYIMAGE_TARGET),$(recoveryimage-deps),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_RECOVERYIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_RECOVERYIMAGE_TARGET)



.PHONY: recoveryimage-nodeps

recoveryimage-nodeps:
@@ -2580,7 +2581,7 @@ $(INSTALLED_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS) 
$(call declare-1p-container,$(INSTALLED_DEBUG_RAMDISK_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_DEBUG_RAMDISK_TARGET),$(INSTALLED_RAMDISK_TARGET),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DEBUG_RAMDISK_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_DEBUG_RAMDISK_TARGET)



.PHONY: ramdisk_debug-nodeps

ramdisk_debug-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
@@ -2647,7 +2648,7 @@ $(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET) 
$(call declare-container-license-metadata,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(INSTALLED_BOOTIMAGE_TARGET),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DEBUG_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_DEBUG_BOOTIMAGE_TARGET)



.PHONY: bootimage_debug-nodeps

bootimage_debug-nodeps: $(MKBOOTIMG) $(AVBTOOL)
@@ -2800,7 +2801,7 @@ $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET): $(MKBOOTFS) | $(COMPRESSION_COMMAND_DE 
$(call declare-1p-container,$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_TEST_HARNESS_RAMDISK_TARGET),$(INTERNAL_TEST_HARNESS_RAMDISK_SRC_DEPS),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_TEST_HARNESS_RAMDISK_TARGET)



.PHONY: ramdisk_test_harness-nodeps

ramdisk_test_harness-nodeps: $(MKBOOTFS) | $(COMPRESSION_COMMAND_DEPS)
@@ -2849,7 +2850,7 @@ $(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_DEBUG_BOOTI 
$(call declare-1p-container,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET),$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_TEST_HARNESS_BOOTIMAGE_TARGET)



.PHONY: bootimage_test_harness-nodeps

bootimage_test_harness-nodeps: $(MKBOOTIMG) $(AVBTOOL)
@@ -3247,7 +3248,7 @@ $(INSTALLED_USERDATAIMAGE_TARGET): $(INSTALLED_USERDATAIMAGE_TARGET_DEPS) 
$(call declare-1p-container,$(INSTALLED_USERDATAIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_USERDATAIMAGE_TARGET),$(INSTALLED_USERDATAIMAGE_TARGET_DEPS),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_USERDATAIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_USERDATAIMAGE_TARGET)



.PHONY: userdataimage-nodeps

userdataimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
@@ -3299,7 +3300,7 @@ $(INSTALLED_BPTIMAGE_TARGET): $(BPTTOOL) $(BOARD_BPT_INPUT_FILES) 
$(call declare-1p-container,$(INSTALLED_BPTIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_BPTIMAGE_TARGET),$(BOARD_BPT_INPUT_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BPTIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_BPTIMAGE_TARGET)



.PHONY: bptimage-nodeps

bptimage-nodeps:
@@ -3338,7 +3339,7 @@ $(INSTALLED_CACHEIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAG 
$(call declare-1p-container,$(INSTALLED_CACHEIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_CACHEIMAGE_TARGET),$(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_CACHEIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_CACHEIMAGE_TARGET)



.PHONY: cacheimage-nodeps

cacheimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
@@ -3924,7 +3925,7 @@ $(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE) $(AVBTOOL) $(BOARD_AV 
$(call declare-1p-container,$(INSTALLED_DTBOIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_DTBOIMAGE_TARGET),$(BOARD_PREBUILT_DTBOIMAGE),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DTBOIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_DTBOIMAGE_TARGET)

else

$(INSTALLED_DTBOIMAGE_TARGET): $(BOARD_PREBUILT_DTBOIMAGE)

	cp $(BOARD_PREBUILT_DTBOIMAGE) $@
@@ -3947,7 +3948,7 @@ INTERNAL_PVMFW_EMBEDDED_AVBKEY := $(call module-target-built-files,pvmfw_sign_ke 
$(call declare-1p-container,$(INSTALLED_PVMFWIMAGE_TARGET),)

$(call declare-container-license-deps,$(INSTALLED_PVMFWIMAGE_TARGET),$(INTERNAL_PVMFWIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_PVMFWIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS += $(INSTALLED_PVMFWIMAGE_TARGET)



$(eval $(call copy-one-file,$(INTERNAL_PVMFWIMAGE_FILES),$(INSTALLED_PVMFWIMAGE_TARGET)))
@@ -4493,7 +4494,7 @@ $(INSTALLED_VBMETA_VENDORIMAGE_TARGET): \ 


$(call declare-1p-container,$(INSTALLED_VBMETA_VENDORIMAGE_TARGET),)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_VBMETA_VENDORIMAGE_TARGET)

UNMOUNTED_NOTICE_VENDOR_DEPS+= $(INSTALLED_VBMETA_VENDORIMAGE_TARGET)

endif



define build-vbmetaimage-target

core/os_licensing.mk

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ systemlicense: $(call corresponding-license-metadata, $(SYSTEM_NOTICE_DEPS)) rep 


ifneq (,$(SYSTEM_NOTICE_DEPS))



SYSTEM_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS)

SYSTEM_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS) $(UNMOUNTED_NOTICE_VENDOR_DEPS)



ifneq ($(PRODUCT_NOTICE_SPLIT),true)

$(eval $(call html-notice-rule,$(target_notice_file_html_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS)))
@@ -30,7 +30,7 @@ vendorlicense: $(call corresponding-license-metadata, $(VENDOR_NOTICE_DEPS)) rep 


ifneq (,$(VENDOR_NOTICE_DEPS))



VENDOR_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS)

VENDOR_NOTICE_DEPS += $(UNMOUNTED_NOTICE_VENDOR_DEPS)



$(eval $(call text-notice-rule,$(target_vendor_notice_file_txt),"Vendor image", \

         "Notices for files contained in all filesystem images except system/system_ext/product/odm/vendor_dlkm/odm_dlkm in this directory:", \