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

Commit 7d1e3538 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Merge product_services into product by default"

parents a5f55d8e 80c80804

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -540,6 +540,10 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libjavacore.so) 
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libopenjdk.so)

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libexpat.so)



# Merge product_services into product

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product_services)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product_services)





# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/envsetup.mk

+2 −1
Original line number Diff line number Diff line
@@ -443,7 +443,8 @@ endif 
# Now we can substitute with the real value of TARGET_COPY_OUT_PRODUCT_SERVICES

MERGE_PRODUCT_SERVICES_INTO_PRODUCT :=

ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder))

  TARGET_COPY_OUT_PRODUCT_SERVICES := system/product_services

  TARGET_COPY_OUT_PRODUCT_SERVICES := $(TARGET_COPY_OUT_PRODUCT)

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES))

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

else ifeq ($(filter product_services system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),)