diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 4 | ||||
| -rw-r--r-- | tools/public.libraries.buildbot.txt | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 47bcaac343..64b9400f66 100644 --- a/Android.mk +++ b/Android.mk @@ -471,10 +471,11 @@ build-art-target-golem: dex2oat dalvikvm patchoat linker libstdc++ \ $(ART_TARGET_SHARED_LIBRARY_BENCHMARK) \ $(TARGET_CORE_IMG_OUT_BASE).art \ $(TARGET_CORE_IMG_OUT_BASE)-interpreter.art - # remove libartd.so and libdexfiled.so from public.libraries.txt because golem builds + # remove debug libraries from public.libraries.txt because golem builds # won't have it. sed -i '/libartd.so/d' $(TARGET_OUT)/etc/public.libraries.txt sed -i '/libdexfiled.so/d' $(TARGET_OUT)/etc/public.libraries.txt + sed -i '/libprofiled.so/d' $(TARGET_OUT)/etc/public.libraries.txt ######################################################################## # Phony target for building what go/lem requires on host. diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index c5277548eb..be1296b990 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -871,9 +871,9 @@ if [ "$HOST" = "n" ]; then # System libraries needed by libarttestd.so PUBLIC_LIBS=libc++.so:libbacktrace.so:libbase.so:libnativehelper.so if [ "$TEST_IS_NDEBUG" = "y" ]; then - PUBLIC_LIBS=$PUBLIC_LIBS:libart.so:libdexfile.so + PUBLIC_LIBS=$PUBLIC_LIBS:libart.so:libdexfile.so:libprofile.so else - PUBLIC_LIBS=$PUBLIC_LIBS:libartd.so:libdexfiled.so + PUBLIC_LIBS=$PUBLIC_LIBS:libartd.so:libdexfiled.so:libprofiled.so fi # Create a script with the command. The command can get longer than the longest diff --git a/tools/public.libraries.buildbot.txt b/tools/public.libraries.buildbot.txt index de636a813a..6c8114558e 100644 --- a/tools/public.libraries.buildbot.txt +++ b/tools/public.libraries.buildbot.txt @@ -8,3 +8,5 @@ libc++.so libdl.so libm.so libnativehelper.so +libprofile.so +libprofiled.so |