Merge "Fix odm output directory for devices w/o vendor partition"
This commit is contained in:
@@ -506,9 +506,9 @@ endif
|
|||||||
###########################################
|
###########################################
|
||||||
# Now we can substitute with the real value of TARGET_COPY_OUT_ODM
|
# Now we can substitute with the real value of TARGET_COPY_OUT_ODM
|
||||||
ifeq ($(TARGET_COPY_OUT_ODM),$(_odm_path_placeholder))
|
ifeq ($(TARGET_COPY_OUT_ODM),$(_odm_path_placeholder))
|
||||||
TARGET_COPY_OUT_ODM := vendor/odm
|
TARGET_COPY_OUT_ODM := $(TARGET_COPY_OUT_VENDOR)/odm
|
||||||
else ifeq ($(filter odm vendor/odm,$(TARGET_COPY_OUT_ODM)),)
|
else ifeq ($(filter odm system/vendor/odm vendor/odm,$(TARGET_COPY_OUT_ODM)),)
|
||||||
$(error TARGET_COPY_OUT_ODM must be either 'odm' or 'vendor/odm', seeing '$(TARGET_COPY_OUT_ODM)'.)
|
$(error TARGET_COPY_OUT_ODM must be either 'odm', 'system/vendor/odm' or 'vendor/odm', seeing '$(TARGET_COPY_OUT_ODM)'.)
|
||||||
endif
|
endif
|
||||||
PRODUCT_COPY_FILES := $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),$(PRODUCT_COPY_FILES))
|
PRODUCT_COPY_FILES := $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),$(PRODUCT_COPY_FILES))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user