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

Commit 157ac24d authored by Jiyong Park's avatar Jiyong Park
Browse files

rename libvixl to libvixl.com.android.art.debug

With I1889653812a980f6a2e3b6b25e7647f7c5919606, libvixl is not available
to the platform as it is included in the ART APEX. To use the APEX
variant of the library, we use the <name>:<apex_name> notation.

Exempt-From-Owner-Approval: cherry-pick from internal

Bug: 150999716
Test: m
Merged-In: I2206f1c28fc0019c0fd726059aa732145f2998ed
(cherry picked from commit 127eae76)
Change-Id: I2206f1c28fc0019c0fd726059aa732145f2998ed
parent ec8abc0e
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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))