Merge "Remove product_services rules if it's merged away"

This commit is contained in:
Anton Hansson 2019-02-05 16:00:44 +00:00 committed by Gerrit Code Review
commit b40f72d0ba
1 changed files with 5 additions and 0 deletions

View File

@ -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