From cae8873df28876c2c556418bae076b492ae9577d Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 13 Nov 2012 12:17:49 +0100 Subject: PFW: Correct test-platform compilation BZ: 67916 Add libstlport in test-plaform's Android.mk. Add a Android.mk that includes test-plaform/Android.mk in the test directory be able to compile test-platform from the source root (m test-platform). Change-Id: I878c4010aa8be4f9de0c4dd6666b9f512e26a309 Origin-Change-Id: Ieeb3bc7e908a2b35f0e0603917b80343a75259e8 Signed-off-by: Kevin Rocard Reviewed-on: http://android.intel.com:8080/76889 Reviewed-by: Barthes, FabienX Tested-by: Barthes, FabienX Reviewed-by: cactus Tested-by: cactus --- test/Android.mk | 7 +++++++ test/test-platform/Android.mk | 19 +++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 test/Android.mk diff --git a/test/Android.mk b/test/Android.mk new file mode 100644 index 0000000..56ffec5 --- /dev/null +++ b/test/Android.mk @@ -0,0 +1,7 @@ +# include virtual HAL test-platform + + +LOCAL_PATH := $(call my-dir) + +include $(LOCAL_PATH)/test-platform/Android.mk + diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk index cf8ed39..ac7da03 100644 --- a/test/test-platform/Android.mk +++ b/test/test-platform/Android.mk @@ -2,8 +2,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE_PATH := - LOCAL_SRC_FILES:= \ main.cpp \ @@ -14,25 +12,22 @@ LOCAL_MODULE:= test-platform LOCAL_MODULE_TAGS := optional +# Ignore non virtual destructor error TARGET_ERROR_FLAGS += -Wno-non-virtual-dtor LOCAL_C_INCLUDES += \ - external/stlport/stlport/ \ + external/stlport/stlport \ bionic/libstdc++ \ - bionic/ + bionic LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/../../parameter \ - $(LOCAL_PATH)/../../remote-processor/ + $(LOCAL_PATH)/../../remote-processor/ -LOCAL_SHARED_LIBRARIES := \ +LOCAL_SHARED_LIBRARIES := \ libparameter \ - libremote-processor - -LOCAL_STATIC_LIBRARIES := - -LOCAL_LDLIBS += -LOCAL_LDFLAGS += + libremote-processor \ + libstlport include $(BUILD_EXECUTABLE) -- cgit v1.1