diff options
Diffstat (limited to 'dynamic-layers')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/libbacktrace_mk_change_out_dir.patch | 6 | ||||
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools_10.0.0.r36.bb | 2 |
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 | |||
19 | 19 | ||
20 | --- git/system/core/debian/libbacktrace.mk 2021-05-21 23:51:55.022408433 +0000 | 20 | --- git/system/core/debian/libbacktrace.mk 2021-05-21 23:51:55.022408433 +0000 |
21 | +++ git/system/core/debian/libbacktrace.mk 2021-05-21 23:53:07.487543521 +0000 | 21 | +++ git/system/core/debian/libbacktrace.mk 2021-05-21 23:53:07.487543521 +0000 |
22 | @@ -1,5 +1,6 @@ | 22 | @@ -1,5 +1,5 @@ |
23 | - | 23 | |
24 | -include /usr/share/dpkg/architecture.mk | 24 | -include /usr/share/dpkg/architecture.mk |
25 | +include ../../rules_yocto.mk | 25 | +include ../../rules_yocto.mk |
26 | +#pass architecture specific info to makefile | ||
27 | +DEB_HOST_ARCH=${deb_host_arch} | ||
28 | 26 | ||
29 | NAME = libbacktrace | 27 | NAME = libbacktrace |
30 | 28 | ||
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() { | |||
145 | done | 145 | done |
146 | 146 | ||
147 | for tool in ${TOOLS_TO_BUILD}; do | 147 | for tool in ${TOOLS_TO_BUILD}; do |
148 | if tool == "libbacktrace"; then | 148 | if [ "$tool" == "libbacktrace" ]; then |
149 | oe_runmake -f ${S}/system/core/debian/${tool}.mk -C ${S}/system/core DEB_HOST_ARCH=${deb_host_arch} | 149 | oe_runmake -f ${S}/system/core/debian/${tool}.mk -C ${S}/system/core DEB_HOST_ARCH=${deb_host_arch} |
150 | else | 150 | else |
151 | oe_runmake -f ${S}/system/core/debian/${tool}.mk -C ${S}/system/core | 151 | oe_runmake -f ${S}/system/core/debian/${tool}.mk -C ${S}/system/core |