aboutsummaryrefslogtreecommitdiffstats
path: root/test/test-platform
diff options
context:
space:
mode:
authorKevin Rocard <kevinx.rocard@intel.com>2012-11-13 12:17:49 +0100
committerDavid Wagner <david.wagner@intel.com>2014-02-12 17:03:30 +0100
commitcae8873df28876c2c556418bae076b492ae9577d (patch)
treef01759bb73ccffe25dca8c69de6958796f0dfb34 /test/test-platform
parenta409daaa0575e2e1db197a32fc95804736acf841 (diff)
downloadexternal_parameter-framework-cae8873df28876c2c556418bae076b492ae9577d.zip
external_parameter-framework-cae8873df28876c2c556418bae076b492ae9577d.tar.gz
external_parameter-framework-cae8873df28876c2c556418bae076b492ae9577d.tar.bz2
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 <kevinx.rocard@intel.com> Reviewed-on: http://android.intel.com:8080/76889 Reviewed-by: Barthes, FabienX <fabienx.barthes@intel.com> Tested-by: Barthes, FabienX <fabienx.barthes@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: cactus <cactus@intel.com>
Diffstat (limited to 'test/test-platform')
-rw-r--r--test/test-platform/Android.mk19
1 files changed, 7 insertions, 12 deletions
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)