Merge "Move definition of create-vendor-odm-symlink within BUILDING_VENDOR_IMAGE" (653e527b) · Commits · e / os / android_build

core/Makefile

+15 −15

Original line number	Diff line number	Diff line
		@@ -2291,21 +2291,6 @@ define create-system-product_services-symlink
		endef
		endif

		# Create symlink /vendor/odm to /odm if necessary.
		ifdef BOARD_USES_ODMIMAGE
		define create-vendor-odm-symlink
		$(hide) if [ -d $(TARGET_OUT_VENDOR)/odm ] && [ ! -h $(TARGET_OUT_VENDOR)/odm ]; then \
		echo 'Non-symlink $(TARGET_OUT_VENDOR)/odm detected!' 1>&2; \
		echo 'You cannot install files to $(TARGET_OUT_VENDOR)/odm while building a separate odm.img!' 1>&2; \
		exit 1; \
		fi
		$(hide) ln -sf /odm $(TARGET_OUT_VENDOR)/odm
		endef
		else
		define create-vendor-odm-symlink
		endef
		endif

		# $(1): output file
		define build-systemimage-target
		@echo "Target system fs image: $(1)"
		@@ -2870,6 +2855,21 @@ $(INSTALLED_FILES_FILE_VENDOR) : $(INTERNAL_VENDORIMAGE_FILES) $(FILESLIST) $(FI
		$(hide) $(FILESLIST) $(TARGET_OUT_VENDOR) > $(@:.txt=.json)
		$(hide) $(FILESLIST_UTIL) -c $(@:.txt=.json) > $@

		# Create symlink /vendor/odm to /odm if necessary.
		ifdef BOARD_USES_ODMIMAGE
		define create-vendor-odm-symlink
		$(hide) if [ -d $(TARGET_OUT_VENDOR)/odm ] && [ ! -h $(TARGET_OUT_VENDOR)/odm ]; then \
		echo 'Non-symlink $(TARGET_OUT_VENDOR)/odm detected!' 1>&2; \
		echo 'You cannot install files to $(TARGET_OUT_VENDOR)/odm while building a separate odm.img!' 1>&2; \
		exit 1; \
		fi
		$(hide) ln -sf /odm $(TARGET_OUT_VENDOR)/odm
		endef
		else
		define create-vendor-odm-symlink
		endef
		endif

		vendorimage_intermediates := \
		$(call intermediates-dir-for,PACKAGING,vendor)
		BUILT_VENDORIMAGE_TARGET := $(PRODUCT_OUT)/vendor.img