Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Android: Make libxmserializer dynamic #136

Merged
krocard merged 1 commit into from
Jun 10, 2015
Merged

Android: Make libxmserializer dynamic #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bindings/python/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ LOCAL_CLANG := false
# Android only provides a 32bit version of python.
LOCAL_32_BIT_ONLY := true

LOCAL_SHARED_LIBRARIES := libparameter_host
LOCAL_STATIC_LIBRARIES := libxmlserializer_host
LOCAL_SHARED_LIBRARIES := libxmlserializer_host libparameter_host

# python is only available in 32bits for now, thus arch is forced to 32bits
PYTHON_INSTALL_PATH := prebuilts/python/$(HOST_OS)-x86/2.7.5/
Expand Down
11 changes: 4 additions & 7 deletions parameter/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,8 @@ common_cflags := \
common_c_includes := \
$(LOCAL_PATH)/include/ \
$(LOCAL_PATH)/../utility/ \
$(LOCAL_PATH)/../xmlserializer/ \
$(LOCAL_PATH)/../remote-processor/

common_shared_libraries := libicuuc

#############################
# Target build

Expand All @@ -155,8 +152,8 @@ LOCAL_MODULE_TAGS := $(common_module_tags)

LOCAL_C_INCLUDES := $(common_c_includes)

LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl
LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
LOCAL_SHARED_LIBRARIES := libxmlserializer libdl
LOCAL_STATIC_LIBRARIES := libpfw_utility

LOCAL_REQUIRED_MODULES := libremote-processor

Expand Down Expand Up @@ -184,8 +181,8 @@ LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
$(common_c_includes)

LOCAL_SHARED_LIBRARIES := $(common_shared_libraries)-host
LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2
LOCAL_SHARED_LIBRARIES := libxmlserializer_host
LOCAL_STATIC_LIBRARIES := libpfw_utility_host libxml2

LOCAL_LDLIBS += -ldl

Expand Down
4 changes: 2 additions & 2 deletions xmlserializer/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ LOCAL_STATIC_LIBRARIES := $(common_static_libraries)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
include $(BUILD_SHARED_LIBRARY)

##############################
# Host build
Expand All @@ -103,5 +103,5 @@ LOCAL_STATIC_LIBRARIES := libxml2

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_HOST_STATIC_LIBRARY)
include $(BUILD_HOST_SHARED_LIBRARY)