commit 8820840d5701cbce8f2c4015e9da85a2eb86d8f7
author Dan Willemsen <dwillemsen@google.com> Tue Oct 19 00:30:37 2021 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Dec 08 09:26:27 2021 -0800
tree 4417e11f42205eb043d47120cc17aa68b88571c7
parent 1295bc51383913eddfa76fb2f9c6e22cac102a4b

Add basic Darwin+Arm64 support as HOST_CROSS

Soong will use this to turn on universal binary support (X86_64 + Arm64
in the same binary).

Bug: 203607969
Test: m sdk-repo-platform-tools sdk-repo-build-tools on Mac
Change-Id: I04612136a42e85f4add95202ce20e741d9aaa302

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 21eac7f..b673050 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -167,6 +167,10 @@
   else
     $(error Unsupported HOST_CROSS_OS $(HOST_CROSS_OS))
   endif
+else ifeq ($(HOST_OS),darwin)
+  HOST_CROSS_OS := darwin
+  HOST_CROSS_ARCH := arm64
+  HOST_CROSS_2ND_ARCH :=
 endif
 
 ifeq ($(HOST_OS),)