diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-05-14 21:59:53 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-05-14 21:59:53 -0700 |
| commit | a817ff9cf61daeb69e8b8382c80677e3e5c573a9 (patch) | |
| tree | 58d297721a7085f2260605bb564c8ad2fe76e7d8 /libcorkscrew/Android.mk | |
| parent | ac5cf925f86706d2bf89948e7cd3379376185d3b (diff) | |
| parent | 07db297045b33d5c0aaa37194da1616d764edd26 (diff) | |
| download | system_core-a817ff9cf61daeb69e8b8382c80677e3e5c573a9.zip system_core-a817ff9cf61daeb69e8b8382c80677e3e5c573a9.tar.gz system_core-a817ff9cf61daeb69e8b8382c80677e3e5c573a9.tar.bz2 | |
resolved conflicts for merge of 07db2970 to jb-mr2-dev-plus-aosp
Change-Id: Idf344a1fc7e2f8ec76232ae14a00298ddd322a55
Diffstat (limited to 'libcorkscrew/Android.mk')
| -rw-r--r-- | libcorkscrew/Android.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libcorkscrew/Android.mk b/libcorkscrew/Android.mk index 8370789..49c3b92 100644 --- a/libcorkscrew/Android.mk +++ b/libcorkscrew/Android.mk @@ -59,23 +59,26 @@ include $(BUILD_SHARED_LIBRARY) # Build test. include $(CLEAR_VARS) -LOCAL_SRC_FILES := test.c -LOCAL_CFLAGS += -std=gnu99 -Werror -fno-inline-small-functions +LOCAL_SRC_FILES := test.cpp +LOCAL_CFLAGS += -Werror -fno-inline-small-functions LOCAL_SHARED_LIBRARIES := libcorkscrew LOCAL_MODULE := libcorkscrew_test LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) -ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) +ifeq ($(HOST_ARCH),x86) # Build libcorkscrew. include $(CLEAR_VARS) LOCAL_SRC_FILES += $(generic_src_files) $(x86_src_files) LOCAL_CFLAGS += -DCORKSCREW_HAVE_ARCH -LOCAL_SHARED_LIBRARIES += libgccdemangle LOCAL_STATIC_LIBRARIES += libcutils liblog -LOCAL_LDLIBS += -ldl -lrt +LOCAL_LDLIBS += -ldl +ifeq ($(HOST_OS),linux) + LOCAL_SHARED_LIBRARIES += libgccdemangle # TODO: is this even needed on Linux? + LOCAL_LDLIBS += -lrt +endif LOCAL_CFLAGS += -std=gnu99 -Werror LOCAL_MODULE := libcorkscrew LOCAL_MODULE_TAGS := optional @@ -83,11 +86,11 @@ include $(BUILD_HOST_SHARED_LIBRARY) # Build test. include $(CLEAR_VARS) -LOCAL_SRC_FILES := test.c -LOCAL_CFLAGS += -std=gnu99 -Werror -fno-inline-small-functions +LOCAL_SRC_FILES := test.cpp +LOCAL_CFLAGS += -Werror LOCAL_SHARED_LIBRARIES := libcorkscrew LOCAL_MODULE := libcorkscrew_test LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_EXECUTABLE) -endif # linux-x86 +endif # HOST_ARCH == x86 |