summaryrefslogtreecommitdiffstats
path: root/parameter
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2014-10-24 17:49:53 +0200
committerDavid Wagner <david.wagner@intel.com>2014-10-24 17:49:53 +0200
commit4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b (patch)
tree307b0e5390831ad00d1e232baa7601305575343b /parameter
parentd9ad02e2a322fff355cd113c5bb98ff4667a95f2 (diff)
parent0c872ff72b6b6c9e263942e5d7b1c2de12531fb4 (diff)
downloadexternal_parameter-framework-4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b.zip
external_parameter-framework-4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b.tar.gz
external_parameter-framework-4fbf2dfa5bda24b3cdb325e230e77314ddf8c93b.tar.bz2
Merge pull request #20 from 01org/fix-build-issues-bis
Fix build issues bis
Diffstat (limited to 'parameter')
-rw-r--r--parameter/Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 778fed9..653ddd0 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -141,13 +141,12 @@ include $(CLEAR_VARS)
LOCAL_COPY_HEADERS_TO := $(common_copy_headers_to)
LOCAL_COPY_HEADERS := $(common_copy_headers)
-LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)
-
LOCAL_CFLAGS := $(common_cflags)
LOCAL_SRC_FILES := $(common_src_files)
LOCAL_MODULE := $(common_module)
+LOCAL_MODULE_OWNER := intel
LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES := $(common_c_includes)
@@ -155,6 +154,7 @@ LOCAL_C_INCLUDES := $(common_c_includes)
LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl
LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
+LOCAL_CLANG := false
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
@@ -171,6 +171,7 @@ LOCAL_CFLAGS := $(common_cflags) -O0 -ggdb
LOCAL_SRC_FILES := $(common_src_files)
LOCAL_MODULE := $(common_module)_host
+LOCAL_MODULE_OWNER := intel
LOCAL_MODULE_TAGS := $(common_module_tags)
LOCAL_C_INCLUDES += \
@@ -181,6 +182,7 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer_host libpfw_utility_host libxml2-sche
LOCAL_LDLIBS += -ldl
+LOCAL_CLANG := false
include $(BUILD_HOST_SHARED_LIBRARY)
################################
@@ -189,6 +191,7 @@ include $(BUILD_HOST_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := $(common_module)_includes
+LOCAL_MODULE_OWNER := intel
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -205,6 +208,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := $(common_module)_includes_host
+LOCAL_MODULE_OWNER := intel
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)