commit 198cf41c904b1368a3f745ce4bc57dfe2080b14d
author Nicolas Geoffray <ngeoffray@google.com> Tue Feb 04 18:30:01 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 05 15:00:56 2020 +0000
tree 5cdf0ad1fea49f5f1562cea87f7df3b5322c2a0d
parent 05fe07c9a1e638fc25994da6487fea59de89f9b3

Use mv instead of cp for activating apexes.

cp has a bug on fugu NRD90R.

Test: test.py
Bug: 148171362
Change-Id: I41529d19846b01eb467c428f3036f4688be625ae

tools/buildbot-sync.sh

diff --git a/tools/buildbot-sync.sh b/tools/buildbot-sync.sh
index e274fd4..705d88a 100755
--- a/tools/buildbot-sync.sh
+++ b/tools/buildbot-sync.sh
@@ -156,13 +156,15 @@
   local src_apex=${1}
   local dst_apex=${2:-${src_apex}}
   echo -e "${green}Activating APEX ${src_apex} as ${dst_apex}...${nc}"
-  # We copy the files from `/system/apex/${src_apex}` to `/apex/${dst_apex}` in
+  # We move the files from `/system/apex/${src_apex}` to `/apex/${dst_apex}` in
   # the chroot directory, instead of simply using a symlink, as Bionic's linker
   # relies on the real path name of a binary (e.g.
   # `/apex/com.android.art/bin/dex2oat`) to select the linker configuration.
   adb shell mkdir -p "$ART_TEST_CHROOT/apex"
   adb shell rm -rf "$ART_TEST_CHROOT/apex/${dst_apex}"
-  adb shell cp -a "$ART_TEST_CHROOT/system/apex/${src_apex}" "$ART_TEST_CHROOT/apex/${dst_apex}" \
+  # Use use mv instead of cp, as cp has a bug on fugu NRD90R where symbolic
+  # links get copied with odd names, eg: libcrypto.so -> /system/lib/libcrypto.soe.sort.so
+  adb shell mv "$ART_TEST_CHROOT/system/apex/${src_apex}" "$ART_TEST_CHROOT/apex/${dst_apex}" \
     || exit 1
 }