diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-18 16:52:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-09-02 13:45:17 -0700 |
| commit | 6af50b75fc0132a9957f19a11357c446b4836b16 (patch) | |
| tree | 53af80c6dcc9f8bd3f9f77d36a94f47da8e1b3b4 /bcinfo | |
| parent | 9436c894e7d71d0665023f609fe0b823d1c604b7 (diff) | |
| download | libbcc-6af50b75fc0132a9957f19a11357c446b4836b16.tar.gz | |
Stop using HOST_OS, whitelist windows modules
Bug: 23566667
Change-Id: I7ef9d73b897788ed4c8a8d8ca9a582cc08af15f9
Diffstat (limited to 'bcinfo')
| -rw-r--r-- | bcinfo/Android.mk | 11 | ||||
| -rw-r--r-- | bcinfo/BitReader_2_7/Android.mk | 4 | ||||
| -rw-r--r-- | bcinfo/BitReader_3_0/Android.mk | 3 | ||||
| -rw-r--r-- | bcinfo/Wrap/Android.mk | 5 |
4 files changed, 10 insertions, 13 deletions
diff --git a/bcinfo/Android.mk b/bcinfo/Android.mk index 3da0d34..89dd817 100644 --- a/bcinfo/Android.mk +++ b/bcinfo/Android.mk @@ -69,7 +69,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libbcinfo LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_IS_HOST_MODULE := true LOCAL_SRC_FILES := $(libbcinfo_SRC_FILES) @@ -81,15 +81,16 @@ LOCAL_C_INCLUDES := $(libbcinfo_C_INCLUDES) LOCAL_STATIC_LIBRARIES += $(libbcinfo_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += libcutils liblog -ifndef USE_MINGW -LOCAL_LDLIBS := -ldl -lpthread -endif +LOCAL_LDLIBS_darwin := -ldl -lpthread +LOCAL_LDLIBS_linux := -ldl -lpthread include $(LOCAL_PATH)/../llvm-loadable-libbcc.mk ifneq ($(CAN_BUILD_HOST_LLVM_LOADABLE_MODULE),true) -LOCAL_SHARED_LIBRARIES += libLLVM +LOCAL_SHARED_LIBRARIES_linux += libLLVM endif +LOCAL_SHARED_LIBRARIES_darwin += libLLVM +LOCAL_SHARED_LIBRARIES_windows += libLLVM include $(LLVM_ROOT_PATH)/llvm-host-build.mk include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/bcinfo/BitReader_2_7/Android.mk b/bcinfo/BitReader_2_7/Android.mk index 181c731..f966459 100644 --- a/bcinfo/BitReader_2_7/Android.mk +++ b/bcinfo/BitReader_2_7/Android.mk @@ -16,7 +16,7 @@ LOCAL_CFLAGS += -D__HOST__ LOCAL_MODULE:= libLLVMBitReader_2_7 -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows include $(LLVM_HOST_BUILD_MK) include $(LLVM_GEN_INTRINSICS_MK) @@ -31,8 +31,6 @@ LOCAL_SRC_FILES := $(bitcode_reader_2_7_SRC_FILES) LOCAL_MODULE:= libLLVMBitReader_2_7 -LOCAL_MODULE_TAGS := optional - include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_STATIC_LIBRARY) diff --git a/bcinfo/BitReader_3_0/Android.mk b/bcinfo/BitReader_3_0/Android.mk index 95ccd40..e0d642f 100644 --- a/bcinfo/BitReader_3_0/Android.mk +++ b/bcinfo/BitReader_3_0/Android.mk @@ -11,7 +11,7 @@ bitcode_reader_3_0_SRC_FILES := \ include $(CLEAR_VARS) LOCAL_MODULE:= libLLVMBitReader_3_0 -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_SRC_FILES := $(bitcode_reader_3_0_SRC_FILES) LOCAL_CFLAGS += -D__HOST__ @@ -26,7 +26,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) include $(CLEAR_VARS) LOCAL_MODULE:= libLLVMBitReader_3_0 -LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(bitcode_reader_3_0_SRC_FILES) diff --git a/bcinfo/Wrap/Android.mk b/bcinfo/Wrap/Android.mk index 1b5db36..92508d8 100644 --- a/bcinfo/Wrap/Android.mk +++ b/bcinfo/Wrap/Android.mk @@ -33,7 +33,7 @@ llvm_wrap_C_INCLUDES := $(LOCAL_PATH)/../../include include $(CLEAR_VARS) LOCAL_MODULE:= libLLVMWrap -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_SRC_FILES := $(llvm_wrap_SRC_FILES) LOCAL_CFLAGS += -D__HOST__ @@ -49,7 +49,6 @@ ifneq (true,$(DISABLE_LLVM_DEVICE_BUILDS)) include $(CLEAR_VARS) LOCAL_MODULE:= libLLVMWrap -LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(llvm_wrap_SRC_FILES) LOCAL_C_INCLUDES := $(llvm_wrap_C_INCLUDES) @@ -57,4 +56,4 @@ LOCAL_C_INCLUDES := $(llvm_wrap_C_INCLUDES) include $(LLVM_DEVICE_BUILD_MK) include $(LLVM_GEN_INTRINSICS_MK) include $(BUILD_STATIC_LIBRARY) -endif
\ No newline at end of file +endif |