Merge "rename libvixl to libvixl.com.android.art.debug" am: dc8a239c69

Change-Id: I1af14e2e6b0e294b7946020705ae141f5e1be757
This commit is contained in:
Jiyong Park
2020-05-07 03:53:57 +00:00
committed by Automerger Merge Worker

View File

@@ -35,6 +35,7 @@ critical_components_static := \
libvold \
libyuv
# Format is <module_name> or <module_name>:<apex_name>
critical_components_shared := \
libaudioprocessing \
libbinder \
@@ -47,7 +48,7 @@ critical_components_shared := \
libopus \
libstagefright \
libunwind \
libvixl
libvixl:com.android.art.debug
# Use the intermediates directory to avoid installing libraries to the device.
intermediates := $(call intermediates-dir-for,PACKAGING,haiku-line-coverage)
@@ -60,7 +61,9 @@ critical_components_static_inputs := $(foreach lib,$(critical_components_static)
$(call intermediates-dir-for,STATIC_LIBRARIES,$(lib))/$(lib).a)
critical_components_shared_inputs := $(foreach lib,$(critical_components_shared), \
$(call intermediates-dir-for,SHARED_LIBRARIES,$(lib))/$(lib).so)
$(eval filename := $(call word-colon,1,$(lib))) \
$(eval modulename := $(subst :,.,$(lib))) \
$(call intermediates-dir-for,SHARED_LIBRARIES,$(modulename))/$(filename).so)
fuzz_target_inputs := $(foreach fuzz,$(fuzz_targets), \
$(call intermediates-dir-for,EXECUTABLES,$(fuzz))/$(fuzz))