From 7e699468fe1b8a1654905cc4a5978eb35f335475 Mon Sep 17 00:00:00 2001
From: Kevin Rocard <kevinx.rocard@intel.com>
Date: Tue, 7 May 2013 17:29:53 +0200
Subject: [remote-processor] Add support for host build

BZ: 107991

In order to generate setting xml at build time,
one need to build and run PFW environement on host.

Add an host compilation target.

Change-Id: I50b4ed0d33597db2e485c45cf2229d62b63c805e
Signed-off-by: Kevin Rocard <kevinx.rocard@intel.com>
Reviewed-on: http://android.intel.com:8080/107269
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Gonzalve, Sebastien <sebastien.gonzalve@intel.com>
Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
---
 remote-processor/Android.mk | 53 +++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 16 deletions(-)

(limited to 'remote-processor')

diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index 79f5059..bef8f90 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -1,10 +1,9 @@
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
+####################
+# Common definitions
 
-LOCAL_SRC_FILES := \
+COMMON_SRC_FILES := \
         Socket.cpp \
         ListeningSocket.cpp \
         ConnectionSocket.cpp \
@@ -14,26 +13,48 @@ LOCAL_SRC_FILES := \
         RemoteProcessorServer.cpp \
         RemoteProcessorServerBuilder.cpp
 
-LOCAL_MODULE := libremote-processor
+COMMON_MODULE := libremote-processor
+COMMON_MODULE_TAGS := optional
 
-LOCAL_MODULE_TAGS := optional
+COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
 
-TARGET_ERROR_FLAGS += -Wno-non-virtual-dtor
+COMMON_LDLIBS := -lpthread
 
-LOCAL_C_INCLUDES +=
+#############################
+# Target build
 
-LOCAL_C_INCLUDES += \
-        external/stlport/stlport/ \
-        bionic/libstdc++ \
-        bionic/
+include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES +=
+LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 
-LOCAL_SHARED_LIBRARIES := libstlport libicuuc
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_MODULE := $(COMMON_MODULE)
+LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
+
+TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+
+LOCAL_C_INCLUDES += \
+    external/stlport/stlport/ \
+    bionic/libstdc++ \
+    bionic/
 
-LOCAL_LDLIBS +=
+LOCAL_SHARED_LIBRARIES := libstlport
 
+LOCAL_LDLIBS += $(COMMON_LDLIBS)
 
 include $(BUILD_SHARED_LIBRARY)
 
+##############################
+# 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_LDLIBS += $(COMMON_LDLIBS)
+
+include $(BUILD_HOST_SHARED_LIBRARY)
-- 
cgit v1.1