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

Commit 74e8d18a authored by Anton Hansson's avatar Anton Hansson
Browse files

Remove product_services rules if it's merged away 

TARGET_COPY_OUT_PRODUCT_SERVICES can be equal to
TARGET_COPY_OUT_PRODUCT, in which case the ld.config
lines containing PRODUCT_SERVICES are redundant.

Test: make and diff
Change-Id: I1dc24eb49d37f1ab0faa6eecdb0ccc974321f4ac
parent 59a01499

rootdir/update_and_install_ld_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -118,7 +118,12 @@ endif 
	$(hide) sed -i.bak -e "s?%SANITIZER_RUNTIME_LIBRARIES%?$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES)?g" $@

	$(hide) sed -i.bak -e "s?%VNDK_VER%?$(PRIVATE_VNDK_VERSION_SUFFIX)?g" $@

	$(hide) sed -i.bak -e "s?%PRODUCT%?$(TARGET_COPY_OUT_PRODUCT)?g" $@

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

	# Remove lines containing %PRODUCT_SERVICES% (identical to the %PRODUCT% ones)

	$(hide) sed -i.bak -e "\?%PRODUCT_SERVICES%?d" $@

else

	$(hide) sed -i.bak -e "s?%PRODUCT_SERVICES%?$(TARGET_COPY_OUT_PRODUCT_SERVICES)?g" $@

endif

	$(hide) sed -i.bak -e "s?^$(PRIVATE_VNDK_VERSION_TAG)??g" $@

	$(hide) sed -i.bak "/^\#VNDK[0-9]\{2\}\#.*$$/d" $@

	$(hide) rm -f $@.bak