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

Commit afbbce3f authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Add library test makefile solutions."

parents 054b0274 70ca5e5b

core/config.mk

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ BUILD_DROIDDOC:= $(BUILD_SYSTEM)/droiddoc.mk 
BUILD_COPY_HEADERS := $(BUILD_SYSTEM)/copy_headers.mk

BUILD_NATIVE_TEST := $(BUILD_SYSTEM)/native_test.mk

BUILD_HOST_NATIVE_TEST := $(BUILD_SYSTEM)/host_native_test.mk



BUILD_SHARED_TEST_LIBRARY := $(BUILD_SYSTEM)/shared_test_lib.mk

BUILD_HOST_SHARED_TEST_LIBRARY := $(BUILD_SYSTEM)/host_shared_test_lib.mk

BUILD_STATIC_TEST_LIBRARY := $(BUILD_SYSTEM)/static_test_lib.mk

BUILD_HOST_STATIC_TEST_LIBRARY := $(BUILD_SYSTEM)/host_static_test_lib.mk



BUILD_NOTICE_FILE := $(BUILD_SYSTEM)/notice_files.mk

BUILD_HOST_DALVIK_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_java_library.mk

BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk

core/host_native_test.mk

+1 −8
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
## Common flags for host native tests are added.

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



LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g

LOCAL_C_INCLUDES +=  \

    external/gtest/include



LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host

LOCAL_SHARED_LIBRARIES +=



LOCAL_LDFLAGS += -lpthread

include $(BUILD_SYSTEM)/host_test_internal.mk



include $(BUILD_HOST_EXECUTABLE)

core/host_shared_test_lib.mk

0 → 100644
+8 −0
Original line number Diff line number Diff line 
##################################################

## A thin wrapper around BUILD_HOST_SHARED_LIBRARY

## Common flags for host native tests are added.

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



include $(BUILD_SYSTEM)/host_test_internal.mk



include $(BUILD_HOST_SHARED_LIBRARY)

core/host_static_test_lib.mk

0 → 100644
+8 −0
Original line number Diff line number Diff line 
##################################################

## A thin wrapper around BUILD_HOST_STATIC_LIBRARY

## Common flags for host native tests are added.

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



include $(BUILD_SYSTEM)/host_test_internal.mk



include $(BUILD_HOST_STATIC_LIBRARY)

core/host_test_internal.mk

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#####################################################

## Shared definitions for all host test compilations.

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



LOCAL_CFLAGS += -DGTEST_OS_LINUX -DGTEST_HAS_STD_STRING -O0 -g

LOCAL_C_INCLUDES +=  external/gtest/include



LOCAL_STATIC_LIBRARIES += libgtest_host libgtest_main_host

LOCAL_SHARED_LIBRARIES +=



LOCAL_LDLIBS += -lpthread