diff options
| -rw-r--r-- | test/Android.mk | 7 | ||||
| -rw-r--r-- | test/test-platform/Android.mk | 19 |
2 files changed, 14 insertions, 12 deletions
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) |