DO NOT MERGE: tweaks to build oreo-x86

Needed to avoid following Android build system errors:

external/llvm70/shared_llvm.mk: error: libLLVM70 (SHARED_LIBRARIES windows-x86) missing libLLVM70GlobalISel (STATIC_LIBRARIES windows-x86)
Available variants:
  libLLVM70GlobalISel (STATIC_LIBRARIES linux-x86_64)
  libLLVM70GlobalISel (STATIC_LIBRARIES linux-x86)
...
external/llvm70/shared_llvm.mk: error: libLLVM70 (SHARED_LIBRARIES windows-x86_64) missing libLLVM70GlobalISel (STATIC_LIBRARIES windows-x86_64)
Available variants:
  libLLVM50GlobalISel (STATIC_LIBRARIES linux-x86_64)
  libLLVM50GlobalISel (STATIC_LIBRARIES linux-x86)

diff --git a/shared_llvm.mk b/shared_llvm.mk
index d6f090e..855e743 100644 (file)
--- a/shared_llvm.mk
+++ b/shared_llvm.mk
@@ -120,9 +120,9 @@ LOCAL_LDLIBS_linux := -ldl -lpthread
 # Use prebuilts for linux and darwin unless
 # FORCE_BUILD_LLVM_COMPONENTS is true
 ifneq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
-LOCAL_MODULE_HOST_OS := windows
+LOCAL_MODULE_HOST_OS := linux
 else
-LOCAL_MODULE_HOST_OS := darwin linux windows
+LOCAL_MODULE_HOST_OS := linux
 endif
 
 include $(LLVM70_HOST_BUILD_MK)