commit 15139871713cb7c97921207a2860be430d02a6a3
author Greg Hartman <ghartman@google.com> Tue Feb 13 15:42:09 2018 -0800
committer Greg Hartman <ghartman@google.com> Tue Feb 13 16:10:37 2018 -0800
tree 912a7ab497cd86dd2930c171248a469dd9fd2083
parent deae2203ae3831467e4a950309fbf90955050295

gatekeeper HAL should not attempt to build in ARM mode on cuttlefish

BUG: 73306519
Test: Local build and boot
Change-Id: I969a2da1f17db73bcc8fbaae4adc37ee7c0ff2d1

guest/hals/gatekeeper/Android.mk

diff --git a/guest/hals/gatekeeper/Android.mk b/guest/hals/gatekeeper/Android.mk
index 46fe5f9..03f684a 100644
--- a/guest/hals/gatekeeper/Android.mk
+++ b/guest/hals/gatekeeper/Android.mk
@@ -17,6 +17,12 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
+
+# See b/67109557
+ifeq (true, $(TARGET_TRANSLATE_2ND_ARCH))
+LOCAL_MULTILIB := first
+endif
+
 LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := gatekeeper.vsoc
 LOCAL_MODULE_RELATIVE_PATH := hw