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

Commit 6e6fb829 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I7266c0cc,I3caba054 am: c986b3ad 

Original change: https://android-review.googlesource.com/c/platform/build/+/2464633



Change-Id: I741ebdb2cb8f1f77e99e50d1026dbe507b0ff7a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7ee2672 c986b3ad

core/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -4723,7 +4723,7 @@ check_vintf_system_log := $(intermediates)/check_vintf_system.log 
check_vintf_all_deps += $(check_vintf_system_log)

$(check_vintf_system_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_system_deps)

	@( $< --check-one --dirmap /system:$(TARGET_OUT) > $@ 2>&1 ) || ( cat $@ && exit 1 )

$(call declare-0p-target,$(check_vintf_system_log))

$(call declare-1p-target,$(check_vintf_system_log))

check_vintf_system_log :=



# -- Check framework manifest against frozen manifests for GSI targets. They need to be compatible.
@@ -4735,7 +4735,7 @@ $(vintffm_log): $(HOST_OUT_EXECUTABLES)/vintffm $(check_vintf_system_deps) 
	@( $< --check --dirmap /system:$(TARGET_OUT) \

	  $(VINTF_FRAMEWORK_MANIFEST_FROZEN_DIR) > $@ 2>&1 ) || ( cat $@ && exit 1 )



$(call declare-0p-target,$(vintffm_log))

$(call declare-1p-target,$(vintffm_log))



endif # check_vintf_system_deps

check_vintf_system_deps :=
@@ -4759,7 +4759,7 @@ $(check_vintf_vendor_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_vend 
	  ( $< --check-one --dirmap /vendor:$(TARGET_OUT_VENDOR) --dirmap /apex:$(APEX_OUT) \

	       --property ro.boot.product.vendor.sku=$(filter-out EMPTY_VENDOR_SKU_PLACEHOLDER,$(vendor_sku)) \

	       > $@ 2>&1 ) || ( cat $@ && exit 1 ); )

$(call declare-0p-target,$(check_vintf_vendor_log))

$(call declare-1p-target,$(check_vintf_vendor_log))

check_vintf_vendor_log :=

endif # check_vintf_vendor_deps

check_vintf_vendor_deps :=
@@ -4920,7 +4920,7 @@ $(check_vintf_compatible_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_ 
	       --property ro.boot.product.vendor.sku=$(filter-out EMPTY_VENDOR_SKU_PLACEHOLDER,$(vendor_sku)) \

	       >> $@ 2>&1 ) || (cat $@ && exit 1); ))



$(call declare-0p-target,$(check_vintf_compatible_log))

$(call declare-1p-target,$(check_vintf_compatible_log))



check_vintf_compatible_log :=

check_vintf_compatible_args :=
@@ -4985,7 +4985,7 @@ $(check_all_partition_sizes_log): \ 
	  $(call intermediates-dir-for,PACKAGING,check-all-partition-sizes)/misc_info.txt, \

	  $@)



$(call declare-0p-target,$(check_all_partition_sizes_log))

$(call declare-1p-target,$(check_all_partition_sizes_log))



.PHONY: check-all-partition-sizes

check-all-partition-sizes: $(check_all_partition_sizes_log)

core/sysprop.mk

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ endif 
	    fi;)

	$(hide) echo "# end of file" >> $$@



$(call declare-0p-target,$(2))

$(call declare-1p-target,$(2))

endef



# -----------------------------------------------------------------