diff options
| author | 2016-12-08 14:11:10 +0000 | |
|---|---|---|
| committer | 2016-12-08 14:11:10 +0000 | |
| commit | b671dcff59dff9ffde0545f1d6e2ca1a0e11a37d (patch) | |
| tree | 5eaf23a4e06f88d084cc8bd2c47d98463649caf4 | |
| parent | e063a7f0f83cce51ffb5f086cde5e6725bb9929b (diff) | |
| parent | e137a2169bb8f438a90302dbfa67c03ba54d2afe (diff) | |
Merge "Add libstdc++ as a dependency for build-target-art-golem."
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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) \ |