ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove product_services rules if it's merged away" am: b40f72d0ba

Browse source 
am: 38d914132d

Change-Id: I6f8a30e44cd18bb0105c65e664d6411896b70be7
This commit is contained in:
Anton Hansson 2019-02-05 08:13:32 -08:00 • committed by android-build-merger
commit 04f3b9c9ea
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rootdir/update_and_install_ld_config.mk
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