StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Can declare 1p without cycles." am: 04d5903f12 am: e26da42cf0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I61afb68743395d7b3191df96a2041f14836f4bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-02 05:07:40 +00:00
committed by Automerger Merge Worker
parent 34376c15fe e26da42cf0
commit 8849fa52d4
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/os_licensing.mk
View File

@@ -21,8 +21,8 @@ $(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
endif endif
$(call declare-0p-target,$(target_notice_file_xml_gz)) $(call declare-1p-target,$(target_notice_file_xml_gz))
$(call declare-0p-target,$(installed_notice_html_or_xml_gz)) $(call declare-1p-target,$(installed_notice_html_or_xml_gz))
endif endif
.PHONY: vendorlicense .PHONY: vendorlicense
@@ -43,8 +43,8 @@ $(eval $(call xml-notice-rule,$(target_vendor_notice_file_xml_gz),"Vendor image"
$(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz) $(installed_vendor_notice_xml_gz): $(target_vendor_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_vendor_notice_file_xml_gz)) $(call declare-1p-target,$(target_vendor_notice_file_xml_gz))
$(call declare-0p-target,$(installed_vendor_notice_xml_gz)) $(call declare-1p-target,$(installed_vendor_notice_xml_gz))
endif endif
.PHONY: odmlicense .PHONY: odmlicense
@@ -62,8 +62,8 @@ $(eval $(call xml-notice-rule,$(target_odm_notice_file_xml_gz),"ODM filesystem i
$(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz) $(installed_odm_notice_xml_gz): $(target_odm_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_odm_notice_file_xml_gz)) $(call declare-1p-target,$(target_odm_notice_file_xml_gz))
$(call declare-0p-target,$(installed_odm_notice_xml_gz)) $(call declare-1p-target,$(installed_odm_notice_xml_gz))
endif endif
.PHONY: oemlicense .PHONY: oemlicense
@@ -84,8 +84,8 @@ $(eval $(call xml-notice-rule,$(target_product_notice_file_xml_gz),"Product imag
$(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz) $(installed_product_notice_xml_gz): $(target_product_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_product_notice_file_xml_gz)) $(call declare-1p-target,$(target_product_notice_file_xml_gz))
$(call declare-0p-target,$(installed_product_notice_xml_gz)) $(call declare-1p-target,$(installed_product_notice_xml_gz))
endif endif
.PHONY: systemextlicense .PHONY: systemextlicense
@@ -103,8 +103,8 @@ $(eval $(call xml-notice-rule,$(target_system_ext_notice_file_xml_gz),"System_ex
$(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz) $(installed_system_ext_notice_xml_gz): $(target_system_ext_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_system_ext_notice_file_xml_gz)) $(call declare-1p-target,$(target_system_ext_notice_file_xml_gz))
$(call declare-0p-target,$(installed_system_ext_notice_xml_gz)) $(call declare-1p-target,$(installed_system_ext_notice_xml_gz))
endif endif
.PHONY: vendor_dlkmlicense .PHONY: vendor_dlkmlicense
@@ -122,8 +122,8 @@ $(eval $(call xml-notice-rule,$(target_vendor_dlkm_notice_file_xml_gz),"Vendor_d
$(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz) $(installed_vendor_dlkm_notice_xml_gz): $(target_vendor_dlkm_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_vendor_dlkm_notice_file_xml_gz)) $(call declare-1p-target,$(target_vendor_dlkm_notice_file_xml_gz))
$(call declare-0p-target,$(installed_vendor_dlkm_notice_xml_gz)) $(call declare-1p-target,$(installed_vendor_dlkm_notice_xml_gz))
endif endif
.PHONY: odm_dlkmlicense .PHONY: odm_dlkmlicense
@@ -141,8 +141,8 @@ $(eval $(call xml-notice-rule,$(target_odm_dlkm_notice_file_xml_gz),"ODM_dlkm fi
$(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz) $(installed_odm_dlkm_notice_xml_gz): $(target_odm_dlkm_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_odm_dlkm_notice_file_xml_gz)) $(call declare-1p-target,$(target_odm_dlkm_notice_file_xml_gz))
$(call declare-0p-target,$(installed_odm_dlkm_notice_xml_gz)) $(call declare-1p-target,$(installed_odm_dlkm_notice_xml_gz))
endif endif
.PHONY: system_dlkmlicense .PHONY: system_dlkmlicense
@@ -160,8 +160,8 @@ $(eval $(call xml-notice-rule,$(target_system_dlkm_notice_file_xml_gz),"System_d
$(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz) $(installed_system_dlkm_notice_xml_gz): $(target_system_dlkm_notice_file_xml_gz)
$(copy-file-to-target) $(copy-file-to-target)
$(call declare-0p-target,$(target_system_dlkm_notice_file_xml_gz)) $(call declare-1p-target,$(target_system_dlkm_notice_file_xml_gz))
$(call declare-0p-target,$(installed_sysetm_dlkm_notice_xml_gz)) $(call declare-1p-target,$(installed_sysetm_dlkm_notice_xml_gz))
endif endif
endif # not TARGET_BUILD_APPS endif # not TARGET_BUILD_APPS