diff options
| author | Guillaume Denneulin <guillaume.denneulin@intel.com> | 2013-12-05 16:24:32 +0100 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:04:15 +0100 |
| commit | 1080f66c39d444bd21be08c0ca3635631a2fc07c (patch) | |
| tree | be69ebf86e7b7efdc6f3577492bf72bec5a9bf5c | |
| parent | 1e78db8ce52d8d63a62e039b9903f0447142139a (diff) | |
| download | external_parameter-framework-1080f66c39d444bd21be08c0ca3635631a2fc07c.zip external_parameter-framework-1080f66c39d444bd21be08c0ca3635631a2fc07c.tar.gz external_parameter-framework-1080f66c39d444bd21be08c0ca3635631a2fc07c.tar.bz2 | |
Modify include handling to comply with new plugins repo
BZ: 156675
Plugins are moving to new repositories.
Modify include handling to comply inter-repo include dependency.
Change-Id: I4f65ab4a7f1f524b59dffc567a679154e3394147
Signed-off-by: Guillaume Denneulin <guillaume.denneulin@intel.com>
| -rwxr-xr-x[-rw-r--r--] | parameter/Android.mk | 55 | ||||
| -rwxr-xr-x[-rw-r--r--] | xmlserializer/Android.mk | 4 |
2 files changed, 59 insertions, 0 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk index 871c9cf..5c3e568 100644..100755 --- a/parameter/Android.mk +++ b/parameter/Android.mk @@ -1,3 +1,24 @@ +# INTEL CONFIDENTIAL +# +# Copyright 2013 Intel Corporation All Rights Reserved. +# The source code contained or described herein and all documents +# related to the source code ("Material") are owned by Intel +# Corporation or its suppliers or licensors. Title to the Material +# remains with Intel Corporation or its suppliers and licensors. The +# Material contains trade secrets and proprietary and confidential +# information of Intel or its suppliers and licensors. The Material is +# protected by worldwide copyright and trade secret laws and treaty +# provisions. No part of the Material may be used, copied, reproduced, +# modified, published, uploaded, posted, transmitted, distributed, or +# disclosed in any way without Intel's prior express written permission. +# +# No license under any patent, copyright, trade secret or other +# intellectual property right is granted to or conferred upon you by +# disclosure or delivery of the Materials, either expressly, by +# implication, inducement, estoppel or otherwise. Any license under +# such intellectual property rights must be express and approved by +# Intel in writing. + LOCAL_PATH := $(call my-dir) #################### @@ -114,6 +135,7 @@ common_c_includes := \ common_shared_libraries := libicuuc common_static_libraries := libxml2 + ############################# # Target build @@ -165,3 +187,36 @@ LOCAL_STATIC_LIBRARIES := libxmlserializer_host libutility_host $(common_static_ LOCAL_LDLIBS += -ldl include $(BUILD_HOST_SHARED_LIBRARY) + +################################ +# Export includes for plugins (Target build) + +include $(CLEAR_VARS) + +LOCAL_MODULE := $(common_module)_includes + +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + +LOCAL_STATIC_LIBRARIES := \ + libxmlserializer \ + libutility \ + $(common_static_libraries) + +include $(BUILD_STATIC_LIBRARY) + +################################ +# Export includes for plugins (Host build) + +include $(CLEAR_VARS) + +LOCAL_MODULE := $(common_module)_includes_host + +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + +LOCAL_STATIC_LIBRARIES := \ + libxmlserializer_host \ + libutility_host \ + $(common_static_libraries) + +include $(BUILD_HOST_STATIC_LIBRARY) + diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk index 0e9fc02..ef3f107 100644..100755 --- a/xmlserializer/Android.mk +++ b/xmlserializer/Android.mk @@ -57,6 +57,8 @@ LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_LDLIBS += $(common_ldlibs) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + include $(BUILD_STATIC_LIBRARY) ############################## @@ -79,4 +81,6 @@ LOCAL_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_LDLIBS += $(common_ldlibs) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + include $(BUILD_HOST_STATIC_LIBRARY) |