Symlink libepoxy/gbm/virglrenderer prebuilts.
Add symlinks so the -l flags generated by rust can find the correct
prebuilts when building crosvm. These can be removed when we're building
these libraries in-tree.
Also, update gen_android_bp.sh to ignore the symlink files when
generating modules.
Bug: 140201589
Test: crosvm builds successfully
Test: gen_android_bp.sh ignores symlinks
Change-Id: I3146bac976ad625f92703c8467af1e1b1f9ed65e
diff --git a/aarch64-linux-gnu/bin/libepoxy.so b/aarch64-linux-gnu/bin/libepoxy.so
new file mode 120000
index 0000000..7cebfbf
--- /dev/null
+++ b/aarch64-linux-gnu/bin/libepoxy.so
@@ -0,0 +1 @@
+libepoxy.so.0
\ No newline at end of file
diff --git a/aarch64-linux-gnu/bin/libgbm.so b/aarch64-linux-gnu/bin/libgbm.so
new file mode 120000
index 0000000..93a9fe6
--- /dev/null
+++ b/aarch64-linux-gnu/bin/libgbm.so
@@ -0,0 +1 @@
+libgbm.so.1
\ No newline at end of file
diff --git a/aarch64-linux-gnu/bin/libvirglrenderer.so b/aarch64-linux-gnu/bin/libvirglrenderer.so
new file mode 120000
index 0000000..e99438b
--- /dev/null
+++ b/aarch64-linux-gnu/bin/libvirglrenderer.so
@@ -0,0 +1 @@
+libvirglrenderer.so.0
\ No newline at end of file
diff --git a/gen_android_bp.sh b/gen_android_bp.sh
index 9378c32..931a731 100755
--- a/gen_android_bp.sh
+++ b/gen_android_bp.sh
@@ -1,12 +1,14 @@
#!/bin/bash
for i in */bin/*; do
- name="${i//\//_}"
- name="${name//-/_}"
- name="${name/_bin_/_}"
- path="$(dirname $(dirname "$i"))"
- stem="$(basename "$i")"
- cat <<EOF
+ if [[ ! -L "$i" ]]
+ then
+ name="${i//\//_}"
+ name="${name//-/_}"
+ name="${name/_bin_/_}"
+ path="$(dirname $(dirname "$i"))"
+ stem="$(basename "$i")"
+ cat <<EOF
cc_prebuilt_binary {
name: "${name}",
srcs: ["${i}"],
@@ -16,16 +18,19 @@
}
EOF
+ fi
done
for i in */lib/*; do
- name="${i//\//_}"
- name="${name//-/_}"
- name="${name/_lib_/_}"
- name="${name}_for_crosvm"
- path="$(dirname $(dirname "$i"))"
- stem="$(basename "$i")"
- cat <<EOF
+ if [[ ! -L "$i" ]]
+ then
+ name="${i//\//_}"
+ name="${name//-/_}"
+ name="${name/_lib_/_}"
+ name="${name}_for_crosvm"
+ path="$(dirname $(dirname "$i"))"
+ stem="$(basename "$i")"
+ cat <<EOF
// Using cc_prebuilt_binary because cc_prebuild_library can't handle stem on pie
cc_prebuilt_binary {
name: "${name}",
@@ -36,4 +41,5 @@
}
EOF
+ fi
done
diff --git a/x86_64-linux-gnu/bin/libepoxy.so b/x86_64-linux-gnu/bin/libepoxy.so
new file mode 120000
index 0000000..7cebfbf
--- /dev/null
+++ b/x86_64-linux-gnu/bin/libepoxy.so
@@ -0,0 +1 @@
+libepoxy.so.0
\ No newline at end of file
diff --git a/x86_64-linux-gnu/bin/libgbm.so b/x86_64-linux-gnu/bin/libgbm.so
new file mode 120000
index 0000000..93a9fe6
--- /dev/null
+++ b/x86_64-linux-gnu/bin/libgbm.so
@@ -0,0 +1 @@
+libgbm.so.1
\ No newline at end of file
diff --git a/x86_64-linux-gnu/bin/libvirglrenderer.so b/x86_64-linux-gnu/bin/libvirglrenderer.so
new file mode 120000
index 0000000..e99438b
--- /dev/null
+++ b/x86_64-linux-gnu/bin/libvirglrenderer.so
@@ -0,0 +1 @@
+libvirglrenderer.so.0
\ No newline at end of file
