diff options
| -rw-r--r-- | Android.mk | 1 | ||||
| -rwxr-xr-x | tools/buildbot-build.sh | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 8d20843792..b26468d186 100644 --- a/Android.mk +++ b/Android.mk @@ -699,6 +699,7 @@ build-art-target-golem: $(RELEASE_ART_APEX) com.android.runtime $(CONSCRYPT_APEX $(ART_TARGET_SHARED_LIBRARY_PALETTE_DEPENDENCIES) \ $(TARGET_OUT_SHARED_LIBRARIES)/libz.so \ $(TARGET_OUT_SHARED_LIBRARIES)/liblz4.so \ + heapprofd_client_api \ libartpalette-system \ standalone-apex-files # remove debug libraries from public.libraries.txt because golem builds diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index 2453ca1a30..d89d47d553 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -141,7 +141,11 @@ if [[ $mode == "target" ]]; then # testing, we need to install an implementation of the libraries (and cannot # rely on the one already installed on the device, if the device is post R and # has it). - implementation_libs="libartpalette-system.so liblog.so" + implementation_libs=( + "heapprofd_client_api.so" + "libartpalette-system.so" + "liblog.so" + ) if [ -d prebuilts/runtime/mainline/platform/impl ]; then if [[ $TARGET_ARCH = arm* ]]; then arch32=arm @@ -150,7 +154,7 @@ if [[ $mode == "target" ]]; then arch32=x86 arch64=x86_64 fi - for so in $implementation_libs; do + for so in ${implementation_libs[@]}; do if [ -d "$ANDROID_PRODUCT_OUT/system/lib" ]; then cmd="cp -p prebuilts/runtime/mainline/platform/impl/$arch32/$so $ANDROID_PRODUCT_OUT/system/lib/$so" echo "Executing $cmd" |