android-tools: correctly pass DEB_HOST_ARCH to libbacktrace

- The code was producing the error "tool: command not found" and the
  else branch was always executed, even for libbacktrace.

- There is no variable "deb_host_arch" defined in rules.yocto, so it's not
  clear what the first line of the patch with DEB_HOST_ARCH=${deb_host_arch}
  was supposed to do. "${deb_host_arch}" is always undefined in this context.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch b/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
index 464b63d..8115170 100644
--- a/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
+++ b/dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch
@@ -19,12 +19,10 @@ Upstream-Status: Pending
 
 --- git/system/core/debian/libbacktrace.mk      2021-05-21 23:51:55.022408433 +0000
 +++ git/system/core/debian/libbacktrace.mk      2021-05-21 23:53:07.487543521 +0000
-@@ -1,5 +1,6 @@
--
+@@ -1,5 +1,5 @@
+
 -include /usr/share/dpkg/architecture.mk
 +include ../../rules_yocto.mk
-+#pass architecture specific info to makefile
-+DEB_HOST_ARCH=${deb_host_arch}
  
  NAME = libbacktrace
  
diff --git a/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb b/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb
index 7fa7e30..db51f69 100644
--- a/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb
+++ b/dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb
@@ -145,7 +145,7 @@ do_compile() {
     done
 
     for tool in ${TOOLS_TO_BUILD}; do
-        if tool == "libbacktrace"; then
+        if [ "$tool" == "libbacktrace" ]; then
             oe_runmake -f ${S}/system/core/debian/${tool}.mk -C ${S}/system/core DEB_HOST_ARCH=${deb_host_arch}
         else
             oe_runmake -f ${S}/system/core/debian/${tool}.mk -C ${S}/system/core