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

Commit 098f49e4 authored by Arman Uguray's avatar Arman Uguray
Browse files

Compile libbtcore and libosi for host 

The static libraries now also compile for a Linux host as libbtcore-host and
libosi-host. The unittests are compiled for the target against Bionic libc and
for the host against glibc.

Bug: 22884515
Change-Id: Iac1310a48cfd2ff43c356cb31165fd176d0e1d39
parent 0fecf8d3

system/btcore/Android.mk

+63 −28
Original line number Diff line number Diff line
@@ -18,17 +18,9 @@ 


LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/../osi/include \

    $(LOCAL_PATH)/..



LOCAL_SRC_FILES := \

# Common variables

# ========================================================

btcoreCommonSrc := \

    src/bdaddr.c \

    src/counter.c \

    src/device_class.c \
@@ -38,38 +30,81 @@ LOCAL_SRC_FILES := \ 
    src/property.c \

    src/uuid.c



btcoreCommonTestSrc := \

    ./test/bdaddr_test.cpp \

    ./test/counter_test.cpp \

    ./test/device_class_test.cpp \

    ./test/property_test.cpp \

    ./test/uuid_test.cpp \

    ../osi/test/AllocationTestHarness.cpp



btcoreCommonIncludes := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/../osi/include \

    $(LOCAL_PATH)/..



# libbtcore static library for target

# ========================================================

include $(CLEAR_VARS)

# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false

LOCAL_C_INCLUDES := $(btcoreCommonIncludes)

LOCAL_SRC_FILES := $(btcoreCommonSrc)

LOCAL_CFLAGS := -std=c99 $(bdroid_CFLAGS)

LOCAL_MODULE := libbtcore

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := libc liblog

LOCAL_MODULE_CLASS := STATIC_LIBRARIES



include $(BUILD_STATIC_LIBRARY)



#####################################################



# libbtcore static library for host

# ========================================================

ifeq ($(HOST_OS),linux)

include $(CLEAR_VARS)



# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false

LOCAL_C_INCLUDES := $(btcoreCommonIncludes)

LOCAL_SRC_FILES := $(btcoreCommonSrc)

# TODO(armansito): Setting _GNU_SOURCE isn't very platform-independent but

# should be compatible for a Linux host OS. We should figure out what to do for

# a non-Linux host OS.

LOCAL_CFLAGS := -std=c99 $(bdroid_CFLAGS) -D_GNU_SOURCE

LOCAL_MODULE := libbtcore-host

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_MODULE_CLASS := STATIC_LIBRARIES

include $(BUILD_HOST_STATIC_LIBRARY)

endif



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/..



LOCAL_SRC_FILES := \

    ./test/bdaddr_test.cpp \

    ./test/counter_test.cpp \

    ./test/device_class_test.cpp \

    ./test/property_test.cpp \

    ./test/uuid_test.cpp \

    ../osi/test/AllocationTestHarness.cpp

# Note: It's good to get the tests compiled both for the host and the target so

# we get to test with both Bionic libc and glibc



# libbtcore unit tests for target

# ========================================================

include $(CLEAR_VARS)

# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false

LOCAL_C_INCLUDES := $(btcoreCommonIncludes)

LOCAL_SRC_FILES := $(btcoreCommonTestSrc)

LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable

LOCAL_MODULE := net_test_btcore



LOCAL_MODULE_TAGS := tests

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_STATIC_LIBRARIES := libbtcore libosi



include $(BUILD_NATIVE_TEST)



# libbtcore unit tests for host

# ========================================================

ifeq ($(HOST_OS),linux)

include $(CLEAR_VARS)

# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false

LOCAL_C_INCLUDES := $(btcoreCommonIncludes)

LOCAL_SRC_FILES := $(btcoreCommonTestSrc)

LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable

LOCAL_MODULE := net_test_btcore

LOCAL_MODULE_TAGS := tests

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_STATIC_LIBRARIES := libbtcore-host libosi-host

include $(BUILD_HOST_NATIVE_TEST)

endif

system/osi/Android.mk

+74 −33
Original line number Diff line number Diff line
@@ -18,24 +18,18 @@ 


LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/.. \

    $(LOCAL_PATH)/../utils/include

# Common variables

# ========================================================



# TODO(mcchou): Remove socket_utils sources after platform specific

# dependencies are abstracted.

LOCAL_SRC_FILES := \

btosiCommonSrc := \

    ./src/alarm.c \

    ./src/allocation_tracker.c \

    ./src/allocator.c \

    ./src/array.c \

    ./src/buffer.c \

    ./src/compat.c \

    ./src/config.c \

    ./src/data_dispatcher.c \

    ./src/eager_reader.c \
@@ -54,28 +48,7 @@ LOCAL_SRC_FILES := \ 
    ./src/socket_utils/socket_local_server.c \

    ./src/thread.c



LOCAL_CFLAGS := -std=c99 -Wall -Werror -fvisibility=hidden

# Many .h files have redefined typedefs

LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition

LOCAL_MODULE := libosi

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := libc liblog

LOCAL_MODULE_CLASS := STATIC_LIBRARIES



include $(BUILD_STATIC_LIBRARY)



#####################################################



include $(CLEAR_VARS)



# osi/include/atomic.h depends on gcc atomic functions

LOCAL_CLANG := false



LOCAL_C_INCLUDES := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/..



LOCAL_SRC_FILES := \

btosiCommonTestSrc := \

    ./test/AlarmTestHarness.cpp \

    ./test/AllocationTestHarness.cpp \

    ./test/alarm_test.cpp \
@@ -94,10 +67,78 @@ LOCAL_SRC_FILES := \ 
    ./test/ringbuffer_test.cpp \

    ./test/thread_test.cpp



btosiCommonIncludes := \

    $(LOCAL_PATH)/include \

    $(LOCAL_PATH)/.. \

    $(LOCAL_PATH)/../utils/include



btosiCommonCFlags := -std=c99 -Wall -Werror -fvisibility=hidden



# libosi static library for target

# ========================================================

include $(CLEAR_VARS)

LOCAL_CLANG := false  # osi/include/atomic.h depends on gcc atomic functions

LOCAL_C_INCLUDES := $(btosiCommonIncludes)

LOCAL_SRC_FILES := $(btosiCommonSrc)

LOCAL_CFLAGS := $(btosiCommonCFlags)

# Many .h files have redefined typedefs

LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition

LOCAL_MODULE := libosi

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := libc liblog

LOCAL_MODULE_CLASS := STATIC_LIBRARIES

include $(BUILD_STATIC_LIBRARY)



# libosi static library for host

# ========================================================

ifeq ($(HOST_OS),linux)

include $(CLEAR_VARS)

LOCAL_CLANG := false  # osi/include/atomic.h depends on gcc atomic functions

LOCAL_C_INCLUDES := $(btosiCommonIncludes)

LOCAL_SRC_FILES := $(btosiCommonSrc)

# TODO(armansito): Setting _GNU_SOURCE isn't very platform-independent but

# should be compatible for a Linux host OS. We should figure out what to do for

# a non-Linux host OS.

LOCAL_CFLAGS := \

	$(btosiCommonCFlags) \

	-D_GNU_SOURCE

# Many .h files have redefined typedefs

LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition

LOCAL_MODULE := libosi-host

LOCAL_MODULE_TAGS := optional

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_MODULE_CLASS := STATIC_LIBRARIES

include $(BUILD_HOST_STATIC_LIBRARY)

endif



# Note: It's good to get the tests compiled both for the host and the target so

# we get to test with both Bionic libc and glibc



# libosi unit tests for target

# ========================================================

include $(CLEAR_VARS)

LOCAL_CLANG := false  # osi/include/atomic.h depends on gcc atomic functions

LOCAL_C_INCLUDES := $(btosiCommonIncludes)

LOCAL_SRC_FILES := $(btosiCommonTestSrc)

LOCAL_CFLAGS := -Wall

LOCAL_MODULE := net_test_osi

LOCAL_MODULE_TAGS := tests

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_STATIC_LIBRARIES := libosi



include $(BUILD_NATIVE_TEST)



# libosi unit tests for host

# ========================================================

ifeq ($(HOST_OS),linux)

include $(CLEAR_VARS)

LOCAL_CLANG := false  # osi/include/atomic.h depends on gcc atomic functions

LOCAL_C_INCLUDES := $(btosiCommonIncludes)

LOCAL_SRC_FILES := $(btosiCommonTestSrc)

LOCAL_CFLAGS := -Wall

LOCAL_LDLIBS := -lrt -lpthread

LOCAL_MODULE := net_test_osi

LOCAL_MODULE_TAGS := tests

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_STATIC_LIBRARIES := libosi-host

include $(BUILD_HOST_NATIVE_TEST)

endif