Fix the 32-bit Windows host tag.

Bug: #45 Change-Id: I4d7f40d6f5609b0067cd89d2b2b75f1195c360bf (cherry picked from commit 3f3b154)
android · Mar 25, 2016 · 77851b7 · 77851b7
1 parent 77fa3c9
commit 77851b7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/build/core/init.mk b/build/core/init.mk
@@ -295,8 +295,15 @@ ifeq ($(HOST_TAG),windows-x86)
             $(call __ndk_error,Aborting.)
         endif
     endif
+
     # special-case the host-tag
     HOST_TAG := windows
+
+    # For 32-bit systems, HOST_TAG == HOST_TAG64. Make sure that remains true
+    # here.
+    ifeq ($(HOST_TAG64),x86)
+        HOST_TAG64 = $(HOST_TAG)
+    endif
 endif
 
 $(call ndk_log,HOST_TAG set to $(HOST_TAG))