1 files changed, 43 insertions, 16 deletions
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index 4ab2f04..eecd813 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -1,32 +1,59 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
+####################
+# Common definitions
 
-LOCAL_MODULE_PATH :=
+COMMON_SRC_FILES := \
+        main.cpp
 
+COMMON_MODULE := remote-process
+COMMON_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := \
-        main.cpp
+COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
 
+COMMON_C_INCLUDES := \
+    $(LOCAL_PATH)/../remote-processor/
 
-LOCAL_MODULE := remote-process
+COMMON_SHARED_LIBRARIES := libremote-processor
 
-LOCAL_MODULE_TAGS := optional
+#############################
+# Target build
 
-TARGET_ERROR_FLAGS += -Wno-non-virtual-dtor
+include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES += \
-        external/stlport/stlport/ \
-        bionic/libstdc++ \
-        bionic/
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../remote-processor/
+LOCAL_MODULE := $(COMMON_MODULE)
+LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
 
-LOCAL_SHARED_LIBRARIES := libstlport libicuuc libremote-processor
-LOCAL_STATIC_LIBRARIES :=
+TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+
+LOCAL_C_INCLUDES += \
+    $(COMMON_C_INCLUDES) \
+    external/stlport/stlport/ \
+    bionic/libstdc++ \
+    bionic/
+
+LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libstlport
 
-LOCAL_LDLIBS +=
-LOCAL_LDFLAGS +=
 
 include $(BUILD_EXECUTABLE)
 
+##############################
+# Host build
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
+
+LOCAL_MODULE := $(COMMON_MODULE)_host
+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)