1 files changed, 43 insertions, 17 deletions
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index a4d0a74..f6f797e 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -1,33 +1,59 @@
 LOCAL_PATH:= $(call my-dir)
 
-include $(CLEAR_VARS)
-
+####################
+# Common definitions
 
-LOCAL_SRC_FILES:= \
+COMMON_SRC_FILES := \
     main.cpp \
     TestPlatform.cpp
 
+COMMON_MODULE := test-platform
+COMMON_MODULE_TAGS := optional
 
-LOCAL_MODULE:= test-platform
+COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
 
-LOCAL_MODULE_TAGS := optional
+COMMON_C_INCLUDES := \
+    $(LOCAL_PATH)/../../parameter \
+    $(LOCAL_PATH)/../../remote-processor/
 
-# Ignore non virtual destructor error
-TARGET_ERROR_FLAGS += -Wno-non-virtual-dtor
+COMMON_SHARED_LIBRARIES := libparameter libremote-processor
 
-LOCAL_C_INCLUDES += \
-    external/stlport/stlport \
-    bionic/libstdc++ \
-    bionic
+#############################
+# Target build
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
+
+LOCAL_MODULE:= $(COMMON_MODULE)
+LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+
+TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/../../parameter \
-    $(LOCAL_PATH)/../../remote-processor/
+    $(COMMON_C_INCLUDES) \
+    external/stlport/stlport/ \
+    bionic/libstdc++ \
+    bionic/
 
-LOCAL_SHARED_LIBRARIES := \
-    libparameter \
-    libremote-processor \
-    libstlport
+LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libstlport
 
 include $(BUILD_EXECUTABLE)
 
+##############################
+# Host build
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
+
+LOCAL_MODULE:= $(COMMON_MODULE)
+LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+
+TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+
+LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
+
+LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
+
+include $(BUILD_HOST_EXECUTABLE)