diff options
| author | David Wagner <david.wagner@intel.com> | 2014-06-30 14:04:57 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-06-30 14:04:57 +0200 |
| commit | e8088d0f60d895a733c00953c0fdd4e9daf0b279 (patch) | |
| tree | c3185dad6d5460831648f4fed8adfb4c2b6effd0 /test | |
| parent | 133d7cb1b373bb05201e8e26d0e456c1e98ef198 (diff) | |
| parent | f2a6d24795485839aa481f4c1d57812701e50e4b (diff) | |
| download | external_parameter-framework-e8088d0f60d895a733c00953c0fdd4e9daf0b279.zip external_parameter-framework-e8088d0f60d895a733c00953c0fdd4e9daf0b279.tar.gz external_parameter-framework-e8088d0f60d895a733c00953c0fdd4e9daf0b279.tar.bz2 | |
Merge pull request #10 from 01org/internal-tree
Realign from internal tree
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-platform/Android.mk | 8 | ||||
| -rw-r--r-- | test/test-platform/CMakeLists.txt | 28 |
2 files changed, 31 insertions, 5 deletions
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk index 139a722..a0ad8ba 100644 --- a/test/test-platform/Android.mk +++ b/test/test-platform/Android.mk @@ -54,14 +54,12 @@ LOCAL_SRC_FILES:= $(common_src_files) LOCAL_MODULE:= $(common_module) LOCAL_MODULE_TAGS := $(common_module_tags) -LOCAL_C_INCLUDES += \ - $(common_c_includes) \ - external/stlport/stlport \ - bionic/ +LOCAL_C_INCLUDES := $(common_c_includes) LOCAL_STATIC_LIBRARIES := libpfw_utility -LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libstlport +LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) +include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) ############################## diff --git a/test/test-platform/CMakeLists.txt b/test/test-platform/CMakeLists.txt index f173c7b..b824057 100644 --- a/test/test-platform/CMakeLists.txt +++ b/test/test-platform/CMakeLists.txt @@ -1,3 +1,31 @@ +# Copyright (c) 2014, 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. + add_executable(test-platform main.cpp TestPlatform.cpp) |