Merge "Fix broken my_image_variant" (4f353b78) · Commits · e / os / android_build

core/base_rules.mk

+14 −14

Original line number	Diff line number	Diff line
		@@ -77,20 +77,6 @@ LOCAL_SYSTEM_EXT_MODULE := true
		endif
		_path :=

		ifeq ($(LOCAL_HOST_MODULE),true)
		my_image_variant := host
		else ifeq ($(LOCAL_VENDOR_MODULE),true)
		my_image_variant := vendor
		else ifeq ($(LOCAL_OEM_MODULE),true)
		my_image_variant := vendor
		else ifeq ($(LOCAL_ODM_MODULE),true)
		my_image_variant := vendor
		else ifeq ($(LOCAL_PRODUCT_MODULE),true)
		my_image_variant := product
		else
		my_image_variant := core
		endif

		# TODO(b/135957588) Remove following workaround
		# LOCAL_PRODUCT_SERVICES_MODULE to LOCAL_PRODUCT_MODULE for all Android.mk
		ifndef LOCAL_PRODUCT_MODULE
		@@ -107,6 +93,20 @@ ifneq ($(filter-out $(LOCAL_PROPRIETARY_MODULE),$(LOCAL_VENDOR_MODULE))$(filter-
		$(call pretty-error,Only one of LOCAL_PROPRIETARY_MODULE[$(LOCAL_PROPRIETARY_MODULE)] and LOCAL_VENDOR_MODULE[$(LOCAL_VENDOR_MODULE)] may be set, or they must be equal)
		endif

		ifeq ($(LOCAL_HOST_MODULE),true)
		my_image_variant := host
		else ifeq ($(LOCAL_VENDOR_MODULE),true)
		my_image_variant := vendor
		else ifeq ($(LOCAL_OEM_MODULE),true)
		my_image_variant := vendor
		else ifeq ($(LOCAL_ODM_MODULE),true)
		my_image_variant := vendor
		else ifeq ($(LOCAL_PRODUCT_MODULE),true)
		my_image_variant := product
		else
		my_image_variant := core
		endif

		non_system_module := $(filter true, \
		$(LOCAL_PRODUCT_MODULE) \
		$(LOCAL_SYSTEM_EXT_MODULE) \