am a0611e66: Initialize structs.
* commit 'a0611e66bec148b176404cf6afe4c9ec9b960414':
Initialize structs.
diff --git a/Android.mk b/Android.mk
index f169857..229c998 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,41 +15,7 @@
#
LOCAL_PATH := $(call my-dir)
-# Static library libslang for host
-# ========================================================
-include $(CLEAR_VARS)
-include $(CLEAR_TBLGEN_VARS)
-
-LLVM_ROOT_PATH := external/llvm
-CLANG_ROOT_PATH := external/clang
-
-include $(CLANG_ROOT_PATH)/clang.mk
-
-LOCAL_MODULE := libslang
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += -Wno-sign-promo
-ifneq ($(TARGET_BUILD_VARIANT),eng)
-LOCAL_CFLAGS += -D__DISABLE_ASSERTS
-endif
-
-TBLGEN_TABLES := \
- AttrList.inc \
- Attrs.inc \
- DeclNodes.inc \
- DiagnosticCommonKinds.inc \
- DiagnosticFrontendKinds.inc \
- DiagnosticSemaKinds.inc \
- StmtNodes.inc
-
-LOCAL_SRC_FILES := \
- slang.cpp \
- slang_utils.cpp \
- slang_backend.cpp \
- slang_pragma_recorder.cpp \
- slang_diagnostic_buffer.cpp
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
+static_libraries_needed_by_slang := \
libLLVMLinker \
libLLVMipo \
libLLVMBitWriter \
@@ -84,6 +50,40 @@
libLLVMSupport \
libLLVMSystem
+# Static library libslang for host
+# ========================================================
+include $(CLEAR_VARS)
+include $(CLEAR_TBLGEN_VARS)
+
+LLVM_ROOT_PATH := external/llvm
+CLANG_ROOT_PATH := external/clang
+
+include $(CLANG_ROOT_PATH)/clang.mk
+
+LOCAL_MODULE := libslang
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_CFLAGS += -Wno-sign-promo
+ifneq ($(TARGET_BUILD_VARIANT),eng)
+LOCAL_CFLAGS += -D__DISABLE_ASSERTS
+endif
+
+TBLGEN_TABLES := \
+ AttrList.inc \
+ Attrs.inc \
+ DeclNodes.inc \
+ DiagnosticCommonKinds.inc \
+ DiagnosticFrontendKinds.inc \
+ DiagnosticSemaKinds.inc \
+ StmtNodes.inc
+
+LOCAL_SRC_FILES := \
+ slang.cpp \
+ slang_utils.cpp \
+ slang_backend.cpp \
+ slang_pragma_recorder.cpp \
+ slang_diagnostic_buffer.cpp
+
LOCAL_LDLIBS := -ldl -lpthread
include $(CLANG_HOST_BUILD_MK)
@@ -136,7 +136,8 @@
llvm-rs-link.cpp
LOCAL_STATIC_LIBRARIES := \
- librslib libslang
+ librslib libslang \
+ $(static_libraries_needed_by_slang)
LOCAL_LDLIBS := -ldl -lpthread
@@ -210,7 +211,8 @@
slang_rs_metadata_spec_encoder.cpp
LOCAL_STATIC_LIBRARIES := \
- libclangDriver libslang
+ libclangDriver libslang \
+ $(static_libraries_needed_by_slang)
ifeq ($(HOST_OS),windows)
LOCAL_LDLIBS := -limagehlp -lpsapi