From e137a2169bb8f438a90302dbfa67c03ba54d2afe Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 8 Dec 2016 13:49:54 +0000 Subject: Add libstdc++ as a dependency for build-target-art-golem. Needed for running with ART_TARGET_LINUX=true Test: builds and runs. Change-Id: Idf74eff0a4114952b71781ed80de5bbe75f666ae --- Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index b2716cdf96..cf3a9e7afb 100644 --- a/Android.mk +++ b/Android.mk @@ -435,8 +435,9 @@ build-art-target: $(TARGET_OUT_EXECUTABLES)/art $(ART_TARGET_DEPENDENCIES) $(TAR # Phony target for only building what go/lem requires on target. .PHONY: build-art-target-golem # Also include libartbenchmark, we always include it when running golem. +# libstdc++ is needed when building for ART_TARGET_LINUX. ART_TARGET_SHARED_LIBRARY_BENCHMARK := $(TARGET_OUT_SHARED_LIBRARIES)/libartbenchmark.so -build-art-target-golem: dex2oat dalvikvm patchoat linker \ +build-art-target-golem: dex2oat dalvikvm patchoat linker libstdc++ \ $(TARGET_OUT)/etc/public.libraries.txt \ $(ART_TARGET_DEX_DEPENDENCIES) \ $(ART_TARGET_SHARED_LIBRARY_DEPENDENCIES) \ -- cgit v1.2.3-59-g8ed1b