Add libprofile/libprofiled to public libraries.

Test: m
Change-Id: I9209234513ed6cf7da01058f44f7806e29b26e20
diff --git a/Android.mk b/Android.mk
index 47bcaac..64b9400 100644
--- a/Android.mk
+++ b/Android.mk
@@ -471,10 +471,11 @@
                         $(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 c527754..be1296b 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -871,9 +871,9 @@
     # 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 de636a8..6c81145 100644
--- a/tools/public.libraries.buildbot.txt
+++ b/tools/public.libraries.buildbot.txt
@@ -8,3 +8,5 @@
 libdl.so
 libm.so
 libnativehelper.so
+libprofile.so
+libprofiled.so