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

Commit d3ae23fa authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Add substitution for product_services and odm." am: 72ba8ee1 

am: 5712de6d

Change-Id: I69e84dcc796cdc9abdf386eb8cc97b5e95bae53a
parents 1a53ab83 5712de6d

core/main.mk

+3 −1
Original line number Original line Diff line number Diff line
@@ -922,7 +922,9 @@ endef 
define resolve-product-relative-paths

define resolve-product-relative-paths

  $(subst $(_vendor_path_placeholder),$(TARGET_COPY_OUT_VENDOR),\

  $(subst $(_vendor_path_placeholder),$(TARGET_COPY_OUT_VENDOR),\

    $(subst $(_product_path_placeholder),$(TARGET_COPY_OUT_PRODUCT),\

    $(subst $(_product_path_placeholder),$(TARGET_COPY_OUT_PRODUCT),\

      $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2)))))

      $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),\

        $(subst $(_odm_path_placeholder),$(TARGET_COPY_OUT_ODM),\

          $(foreach p,$(1),$(call append-path,$(PRODUCT_OUT),$(p)$(2)))))))

endef

endef





# Lists most of the files a particular product installs, including:

# Lists most of the files a particular product installs, including: