Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d457fe1 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Enable building libbase on Windows."

parents c2d9cc85 b2326bd5

base/Android.mk

+8 −4
Original line number Diff line number Diff line
@@ -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