From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 28 Apr 2016 10:58:03 +0000 (+0100)
Subject: Add and use public.libraries.buildbot.txt file.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f81374524dbe3f2390cc5d131f885c3129e82223;p=android-x86%2Fart.git

Add and use public.libraries.buildbot.txt file.

Needed after the latest NativeLoader changes.

Change-Id: Ia80ebe85ccfc702470eebe6daa9d675abcf8014d
---

diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 2eb52bcad..304c2a939 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -46,9 +46,14 @@ while true; do
 done
 
 if [[ $mode == "host" ]]; then
-  make_command="make $j_arg $showcommands build-art-host-tests $common_targets ${out_dir}/host/linux-x86/lib/libjavacoretests.so ${out_dir}/host/linux-x86/lib64/libjavacoretests.so"
+  make_command="make $j_arg $showcommands build-art-host-tests $common_targets"
+  make_command+=" ${out_dir}/host/linux-x86/lib/libjavacoretests.so "
+  make_command+=" ${out_dir}/host/linux-x86/lib64/libjavacoretests.so"
 elif [[ $mode == "target" ]]; then
-  make_command="make $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh ${out_dir}/host/linux-x86/bin/adb libstdc++"
+  make_command="make $j_arg $showcommands build-art-target-tests $common_targets"
+  make_command+=" libjavacrypto libjavacoretests linker toybox toolbox sh"
+  make_command+=" ${out_dir}/host/linux-x86/bin/adb libstdc++ "
+  make_command+=" ${out_dir}/target/product/${TARGET_PRODUCT}/system/etc/public.libraries.txt"
 fi
 
 echo "Executing $make_command"
diff --git a/tools/public.libraries.buildbot.txt b/tools/public.libraries.buildbot.txt
new file mode 100644
index 000000000..6251da3ad
--- /dev/null
+++ b/tools/public.libraries.buildbot.txt
@@ -0,0 +1,3 @@
+libc.so
+libdl.so
+libm.so