Merge "Ensure that libbase and liblog can be built for Windows."
This commit is contained in:
commit
933f4fd413
|
@ -79,6 +79,7 @@ LOCAL_SHARED_LIBRARIES := liblog
|
|||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
||||
LOCAL_STATIC_LIBRARIES := libcutils
|
||||
LOCAL_MULTILIB := both
|
||||
LOCAL_MODULE_HOST_OS := darwin linux windows
|
||||
include $(BUILD_HOST_SHARED_LIBRARY)
|
||||
|
||||
# Tests
|
||||
|
|
|
@ -50,6 +50,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := liblog
|
|||
LOCAL_LDLIBS_linux := -lrt
|
||||
LOCAL_MULTILIB := both
|
||||
LOCAL_CXX_STL := none
|
||||
LOCAL_MODULE_HOST_OS := darwin linux windows
|
||||
include $(BUILD_HOST_SHARED_LIBRARY)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue