diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-30 10:30:42 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-30 10:30:42 -0700 |
| commit | b2326bd56c7449298acf28318f1692f90e4bfa58 (patch) | |
| tree | 0408048cbd70dd4e2deb0fc8712ec761a9b9ed06 | |
| parent | 934102baf8fca57abf63df7f134e977e696722db (diff) | |
Enable building libbase on Windows.
We have to exclude the logging facilities for now (since we don't have
a std::mutex on Windows), but there's plenty else in here that is
worth having.
Change-Id: I6d1369e34e08ea2e88a0b1130c4462e5d35d99e2
| -rw-r--r-- | base/Android.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/base/Android.mk b/base/Android.mk index 7bd317b77..ad85c6bac 100644 --- a/base/Android.mk +++ b/base/Android.mk @@ -18,13 +18,11 @@ LOCAL_PATH := $(call my-dir) libbase_src_files := \ file.cpp \ - logging.cpp \ stringprintf.cpp \ strings.cpp \ libbase_test_src_files := \ file_test.cpp \ - logging_test.cpp \ stringprintf_test.cpp \ strings_test.cpp \ test_main.cpp \ @@ -40,7 +38,7 @@ libbase_cppflags := \ include $(CLEAR_VARS) LOCAL_MODULE := libbase LOCAL_CLANG := true -LOCAL_SRC_FILES := $(libbase_src_files) +LOCAL_SRC_FILES := $(libbase_src_files) logging.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_CPPFLAGS := $(libbase_cppflags) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include @@ -63,6 +61,9 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libbase LOCAL_SRC_FILES := $(libbase_src_files) +ifneq ($(HOST_OS),windows) + LOCAL_SRC_FILES += logging.cpp +endif LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_CPPFLAGS := $(libbase_cppflags) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include @@ -84,7 +85,7 @@ include $(BUILD_HOST_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libbase_test LOCAL_CLANG := true -LOCAL_SRC_FILES := $(libbase_test_src_files) +LOCAL_SRC_FILES := $(libbase_test_src_files) logging_test.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_CPPFLAGS := $(libbase_cppflags) LOCAL_SHARED_LIBRARIES := libbase @@ -96,6 +97,9 @@ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_MODULE := libbase_test LOCAL_SRC_FILES := $(libbase_test_src_files) +ifneq ($(HOST_OS),windows) + LOCAL_SRC_FILES += logging_test.cpp +endif LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_CPPFLAGS := $(libbase_cppflags) LOCAL_SHARED_LIBRARIES := libbase |