diff options
| author | François Gaffie <francois.gaffie@intel.com> | 2016-02-17 10:58:44 +0100 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2016-03-04 17:42:09 -0800 |
| commit | 9368eea42a1afb01dd44110582f997115b50e742 (patch) | |
| tree | 5efc2015ec5d52fc32453ad5a1a82a3f4a6b4919 /support/android | |
| parent | 0efdadfc1eacc7271c8f854a8a610fdc2cc66102 (diff) | |
| download | platform_external_parameter-framework-9368eea42a1afb01dd44110582f997115b50e742.tar.gz platform_external_parameter-framework-9368eea42a1afb01dd44110582f997115b50e742.tar.bz2 platform_external_parameter-framework-9368eea42a1afb01dd44110582f997115b50e742.zip | |
parameter-framework: Drop of github upstream version v3.2.4
Main features are:
-Networking code may now be opted-out
(for android build: no socket opened for user build)
-Get rid of python prebuild for XML generation
Bug: 22887211
Change-Id: Ieee49b439f694f14ce48c23127d34622691397ef
Signed-off-by: François Gaffie <francois.gaffie@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Diffstat (limited to 'support/android')
| -rw-r--r-- | support/android/build_pfw_settings.mk | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/support/android/build_pfw_settings.mk b/support/android/build_pfw_settings.mk deleted file mode 100644 index e51adfd..0000000 --- a/support/android/build_pfw_settings.mk +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (c) 2014-2015, 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 -# As of Android K, python is available as prebuilt. We can't reliably use the -# host's default python because the low-level python binding has been compiled -# against Android's Python headers. -# BTW, python is only available in 32bits for now, thus arch is forced to 32bits -$(LOCAL_BUILT_MODULE): MY_PYTHON := prebuilts/python/$(HOST_OS)-x86/2.7.5/bin/python -# The parameter-framework binding module is installed on these locations on -# Android (On 64bit machines, PyPfw.py is installed in the 'lib64' directory -# and _PyPfw.so is installed in the 'lib' directory, hence the need for these -# two directories in the PYTHONPATH) -$(LOCAL_BUILT_MODULE): MY_ENV := PYTHONPATH=$(HOST_OUT_SHARED_LIBRARIES):$(2ND_HOST_OUT_SHARED_LIBRARIES) - -$(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_ENV) $(MY_PYTHON) "$(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) |