diff options
author | François Gaffie <francois.gaffie@intel.com> | 2016-02-17 08:04:43 +0100 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2016-03-04 17:54:33 -0800 |
commit | 481587bdf35ee618daf7d0d55aeba9023052ad36 (patch) | |
tree | 4e9263583efa28a86bc7bf788479644c7f159bc5 /support | |
parent | 0ee85db398be8ea33d67cc42f99a1468cd6c8180 (diff) | |
download | parameter-framework-481587bdf35ee618daf7d0d55aeba9023052ad36.tar.gz |
parameter-framework: integrate v3.2.4 within Android environment
This patch makes the integration of the new PFW v3.2.4 within
Android by adding the required makefile, required license file,
required header files.
Bug: 22887211
Change-Id: I2b02af30b0540e72b1fab0c7250076cb55630af3
Signed-off-by: François Gaffie <francois.gaffie@intel.com>
Diffstat (limited to 'support')
-rw-r--r-- | support/android/build_pfw_settings.mk | 59 | ||||
-rw-r--r-- | support/android/parameter/parameter_export.h | 35 | ||||
-rw-r--r-- | support/android/parameter/version.h | 30 | ||||
-rw-r--r-- | support/android/remote-processor/remote_processor_export.h | 35 |
4 files changed, 159 insertions, 0 deletions
diff --git a/support/android/build_pfw_settings.mk b/support/android/build_pfw_settings.mk new file mode 100644 index 0000000..271afbc --- /dev/null +++ b/support/android/build_pfw_settings.mk @@ -0,0 +1,59 @@ +# Copyright (c) 2016, Intel Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation and/or +# other materials provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors +# may be used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_TAGS := optional + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): MY_TOOL := $(HOST_OUT)/bin/domainGenerator.py +$(LOCAL_BUILT_MODULE): MY_TOPLEVEL_FILE := $(PFW_TOPLEVEL_FILE) +$(LOCAL_BUILT_MODULE): MY_CRITERIA_FILE := $(PFW_CRITERIA_FILE) +$(LOCAL_BUILT_MODULE): MY_TUNING_FILE := $(PFW_TUNING_FILE) +$(LOCAL_BUILT_MODULE): MY_EDD_FILES := $(PFW_EDD_FILES) +$(LOCAL_BUILT_MODULE): MY_DOMAIN_FILES := $(PFW_DOMAIN_FILES) +$(LOCAL_BUILT_MODULE): MY_SCHEMAS_DIR := $(PFW_SCHEMAS_DIR) + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(HOST_OUT)/bin/domainGenerator.py + $(hide) mkdir -p "$(dir $@)" + + "$(MY_TOOL)" --validate \ + --toplevel-config "$(MY_TOPLEVEL_FILE)" \ + --criteria "$(MY_CRITERIA_FILE)" \ + --initial-settings $(MY_TUNING_FILE) \ + --add-edds $(MY_EDD_FILES) \ + --add-domains $(MY_DOMAIN_FILES) \ + --schemas-dir $(MY_SCHEMAS_DIR) > "$@" + +# Clear variables for further use +PFW_TOPLEVEL_FILE := +PFW_CRITERIA_FILE := +PFW_TUNING_FILE := +PFW_EDD_FILES := +PFW_DOMAIN_FILES := +PFW_SCHEMAS_DIR := $(PFW_DEFAULT_SCHEMAS_DIR) diff --git a/support/android/parameter/parameter_export.h b/support/android/parameter/parameter_export.h new file mode 100644 index 0000000..cb4a3c6 --- /dev/null +++ b/support/android/parameter/parameter_export.h @@ -0,0 +1,35 @@ + +#ifndef PARAMETER_EXPORT_H +#define PARAMETER_EXPORT_H + +#ifdef PARAMETER_STATIC_DEFINE +# define PARAMETER_EXPORT +# define PARAMETER_NO_EXPORT +#else +# ifndef PARAMETER_EXPORT +# ifdef parameter_EXPORTS + /* We are building this library */ +# define PARAMETER_EXPORT __attribute__((visibility("default"))) +# else + /* We are using this library */ +# define PARAMETER_EXPORT __attribute__((visibility("default"))) +# endif +# endif + +# ifndef PARAMETER_NO_EXPORT +# define PARAMETER_NO_EXPORT __attribute__((visibility("hidden"))) +# endif +#endif + +#ifndef PARAMETER_DEPRECATED +# define PARAMETER_DEPRECATED __attribute__ ((__deprecated__)) +# define PARAMETER_DEPRECATED_EXPORT PARAMETER_EXPORT __attribute__ ((__deprecated__)) +# define PARAMETER_DEPRECATED_NO_EXPORT PARAMETER_NO_EXPORT __attribute__ ((__deprecated__)) +#endif + +#define DEFINE_NO_DEPRECATED 0 +#if DEFINE_NO_DEPRECATED +# define PARAMETER_NO_DEPRECATED +#endif + +#endif diff --git a/support/android/parameter/version.h b/support/android/parameter/version.h new file mode 100644 index 0000000..7b0a43e --- /dev/null +++ b/support/android/parameter/version.h @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2016, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#define PARAMETER_FRAMEWORK_VERSION "v3.2.4" diff --git a/support/android/remote-processor/remote_processor_export.h b/support/android/remote-processor/remote_processor_export.h new file mode 100644 index 0000000..6612d9c --- /dev/null +++ b/support/android/remote-processor/remote_processor_export.h @@ -0,0 +1,35 @@ + +#ifndef REMOTE_PROCESSOR_EXPORT_H +#define REMOTE_PROCESSOR_EXPORT_H + +#ifdef REMOTE_PROCESSOR_STATIC_DEFINE +# define REMOTE_PROCESSOR_EXPORT +# define REMOTE_PROCESSOR_NO_EXPORT +#else +# ifndef REMOTE_PROCESSOR_EXPORT +# ifdef remote_processor_EXPORTS + /* We are building this library */ +# define REMOTE_PROCESSOR_EXPORT __attribute__((visibility("default"))) +# else + /* We are using this library */ +# define REMOTE_PROCESSOR_EXPORT __attribute__((visibility("default"))) +# endif +# endif + +# ifndef REMOTE_PROCESSOR_NO_EXPORT +# define REMOTE_PROCESSOR_NO_EXPORT __attribute__((visibility("hidden"))) +# endif +#endif + +#ifndef REMOTE_PROCESSOR_DEPRECATED +# define REMOTE_PROCESSOR_DEPRECATED __attribute__ ((__deprecated__)) +# define REMOTE_PROCESSOR_DEPRECATED_EXPORT REMOTE_PROCESSOR_EXPORT __attribute__ ((__deprecated__)) +# define REMOTE_PROCESSOR_DEPRECATED_NO_EXPORT REMOTE_PROCESSOR_NO_EXPORT __attribute__ ((__deprecated__)) +#endif + +#define DEFINE_NO_DEPRECATED 0 +#if DEFINE_NO_DEPRECATED +# define REMOTE_PROCESSOR_NO_DEPRECATED +#endif + +#endif |