Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f am: 20d5f0f821 (d9713075) · Commits · e / os / android_build

core/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -736,8 +736,10 @@ $(call dist-for-goals,droidcore,$(BUILD_SYSTEM_STATS))
	# -----------------------------------------------------------------		# -----------------------------------------------------------------
	# build /product/etc/security/avb/system_other.avbpubkey if needed		# build /product/etc/security/avb/system_other.avbpubkey if needed
	ifdef BUILDING_SYSTEM_OTHER_IMAGE		ifdef BUILDING_SYSTEM_OTHER_IMAGE
			ifeq ($(BOARD_AVB_ENABLE),true)
	INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET := $(TARGET_OUT_PRODUCT_ETC)/security/avb/system_other.avbpubkey		INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET := $(TARGET_OUT_PRODUCT_ETC)/security/avb/system_other.avbpubkey
	ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET)		ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET)
			endif # BOARD_AVB_ENABLE
	endif # BUILDING_SYSTEM_OTHER_IMAGE		endif # BUILDING_SYSTEM_OTHER_IMAGE

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