aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--parameter/Android.mk8
-rw-r--r--remote-process/Android.mk3
-rw-r--r--remote-processor/Android.mk2
-rw-r--r--test/test-platform/Android.mk5
-rw-r--r--utility/Android.mk2
-rw-r--r--xmlserializer/Android.mk2
6 files changed, 12 insertions, 10 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index c4d57e0..196ae38 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -107,7 +107,7 @@ COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../remote-processor/
COMMON_SHARED_LIBRARIES := libicuuc
-COMMON_STATIC_LIBRARIES := libxmlserializer libutility libxml2
+COMMON_STATIC_LIBRARIES := libxml2
#############################
# Target build
@@ -131,7 +131,7 @@ LOCAL_C_INCLUDES += \
bionic/
LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES) libdl libstlport
-LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES := libxmlserializer libutility $(COMMON_STATIC_LIBRARIES)
include $(BUILD_SHARED_LIBRARY)
@@ -145,7 +145,7 @@ LOCAL_COPY_HEADERS := $(COMMON_COPY_HEADERS)
LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
-LOCAL_MODULE := $(COMMON_MODULE)
+LOCAL_MODULE := $(COMMON_MODULE)_host
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
LOCAL_CFLAGS += $(COMMON_CFLAGS)
@@ -154,7 +154,7 @@ LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
-LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
+LOCAL_STATIC_LIBRARIES := libxmlserializer_host libutility_host $(COMMON_STATIC_LIBRARIES)
LOCAL_LDLIBS += -ldl
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index 8330e0a..b4502eb 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -51,6 +51,7 @@ LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES)
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(foreach SHARED_LIBRARY,$(COMMON_SHARED_LIBRARIES), \
+ $(SHARED_LIBRARY)_host)
include $(BUILD_HOST_EXECUTABLE)
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index 2a79297..514afd9 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -46,7 +46,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
-LOCAL_MODULE := $(COMMON_MODULE)
+LOCAL_MODULE := $(COMMON_MODULE)_host
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
LOCAL_CFLAGS += $(COMMON_CFLAGS)
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index 759af73..5a91b02 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -44,13 +44,14 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
-LOCAL_MODULE:= $(COMMON_MODULE)
+LOCAL_MODULE:= $(COMMON_MODULE)_host
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
-LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(foreach SHARED_LIBRARY,$(COMMON_SHARED_LIBRARIES), \
+ $(SHARED_LIBRARY)_host)
include $(BUILD_HOST_EXECUTABLE)
diff --git a/utility/Android.mk b/utility/Android.mk
index 2edaca5..037d94a 100644
--- a/utility/Android.mk
+++ b/utility/Android.mk
@@ -33,7 +33,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
-LOCAL_MODULE := $(COMMON_MODULE)
+LOCAL_MODULE := $(COMMON_MODULE)_host
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 630cc34..2b06440 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -59,7 +59,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
-LOCAL_MODULE := $(COMMON_MODULE)
+LOCAL_MODULE := $(COMMON_MODULE)_host
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
LOCAL_CFLAGS += $(COMMON_CFLAGS)