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

Commit c18689e4 authored by dianlujitao's avatar dianlujitao Committed by android-build-merger
Browse files

Merge "Fix odm output directory for devices w/o vendor partition" am:... 

Merge "Fix odm output directory for devices w/o vendor partition" am: 46cfab96 am: eec39a95 am: a620ad1f
am: d50139f7

Change-Id: I3bab84b8e5574556b2a26d9bcc40f4a82909ab36
parents 5040b151 d50139f7

core/board_config.mk

+3 −3
Original line number Diff line number Diff line
@@ -506,9 +506,9 @@ endif 
###########################################

# Now we can substitute with the real value of TARGET_COPY_OUT_ODM

ifeq ($(TARGET_COPY_OUT_ODM),$(_odm_path_placeholder))

  TARGET_COPY_OUT_ODM := vendor/odm

else ifeq ($(filter odm vendor/odm,$(TARGET_COPY_OUT_ODM)),)

  $(error TARGET_COPY_OUT_ODM must be either 'odm' or 'vendor/odm', seeing '$(TARGET_COPY_OUT_ODM)'.)

  TARGET_COPY_OUT_ODM := $(TARGET_COPY_OUT_VENDOR)/odm

else ifeq ($(filter odm system/vendor/odm vendor/odm,$(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

PRODUCT_COPY_FILES := $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),$(PRODUCT_COPY_FILES))