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

Merge "Fix sed command on Mac builds" am: 42a5dd9c41

Browse source 
am: ad7bf56b1d

Change-Id: Ibdb85a157037247e2a37d16bf974c9d9812801f3
This commit is contained in:
Vic Yang 2019-03-25 06:47:23 -07:00 • committed by android-build-merger
commit e22977e8fa
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rootdir/update_and_install_ld_config.mk
View file

@ -134,8 +134,8 @@ else
# if TARGET_VNDK_USE_CORE_VARIANT is not set. In this case, we need to remove # if TARGET_VNDK_USE_CORE_VARIANT is not set. In this case, we need to remove
# the entire line in the linker config so that we are not left with a line # the entire line in the linker config so that we are not left with a line
# like: # like:
# namespace.sphal.link.default.shared_libs += # namespace.vndk.link.vndk_in_system.shared_libs =
$(hide) sed -i.bak -e "s?^.*\+= %VNDK_USING_CORE_VARIANT_LIBRARIES%\$$??" $@ $(hide) sed -i.bak -e 's?^.*= %VNDK_USING_CORE_VARIANT_LIBRARIES%$$??' $@
endif endif
$(hide) echo -n > $(PRIVATE_INTERMEDIATES_DIR)/private_llndk && \ $(hide) echo -n > $(PRIVATE_INTERMEDIATES_DIR)/private_llndk && \