Remove ChromeOS specific files from libweave repo
Change-Id: Id7dae764d21d52afc1d9a46292f0cad82d21903c
Reviewed-on: https://weave-review.googlesource.com/1330
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
(cherry picked from commit 35fb87b830270adaf3b24b18cb43db8debb62bd8)
Reviewed-on: https://weave-review.googlesource.com/1345
Reviewed-by: Vitaly Buka <vitalybuka@google.com>
diff --git a/libweave/README b/libweave/README
index d8fbd3f..7e519b9 100644
--- a/libweave/README
+++ b/libweave/README
@@ -27,23 +27,13 @@
Example of device code:
examples/
-Optional dependencies:
- external/
+Dependencies:
third_party/
Build files:
libweave_standalone.gyp
libweave_common.gypi
-ChromiumOS specific build files:
- libweave-test.pc.in
- libweave.pc.in
- platform2.gyp
- platform2_preinstall.sh
-
-AOSP specific build files:
- Android.mk
-
Quick start on Ubuntu
---------------------
diff --git a/libweave/platform2.gyp b/libweave/platform2.gyp
deleted file mode 100644
index 964dc57..0000000
--- a/libweave/platform2.gyp
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2015 The Weave Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-{
- 'includes': [
- 'libweave.gypi',
- ],
- 'target_defaults': {
- 'variables': {
- 'deps': [
- 'expat',
- 'libcrypto',
- ],
- },
- 'include_dirs': [
- '<(platform2_root)/../weave/libweave/libweave',
- '<(platform2_root)/../weave/libweave/libweave/include',
- '<(platform2_root)/../weave/libweave/libweave/third_party/modp_b64/modp_b64/',
- ],
- },
- 'targets': [
- {
- 'target_name': 'libweave_common',
- 'type': 'static_library',
- 'cflags!': ['-fPIE'],
- 'cflags': ['-fPIC'],
- 'variables': {
- 'deps': [
- 'libchrome-<(libbase_ver)',
- ],
- },
- 'sources': [
- '<@(weave_sources)',
- ],
- },
- {
- 'target_name': 'libweave-<(libbase_ver)',
- 'type': 'shared_library',
- 'variables': {
- 'deps': [
- 'libchrome-<(libbase_ver)',
- ],
- },
- 'includes': [
- '../../../platform2/common-mk/deps.gypi',
- ],
- 'dependencies': [
- 'libweave_common',
- ],
- 'sources': [
- 'src/empty.cc'
- ],
- },
- {
- 'target_name': 'libweave-test-<(libbase_ver)',
- 'type': 'static_library',
- 'standalone_static_library': 1,
- 'variables': {
- 'deps': [
- 'libchrome-<(libbase_ver)',
- ],
- },
- 'sources': [
- '<@(weave_test_sources)',
- ],
- 'includes': ['../../../platform2/common-mk/deps.gypi'],
- },
- {
- 'target_name': 'libweave_base_common',
- 'type': 'static_library',
- 'cflags!': ['-fPIE'],
- 'cflags': [
- '-fPIC',
- '-Wno-format-nonliteral',
- '-Wno-char-subscripts',
- '-Wno-deprecated-register',
- ],
- 'include_dirs': [
- '../libweave/external',
- ],
- 'sources': [
- '<@(weave_sources)',
- '<@(base_sources)',
- ],
- },
- {
- 'target_name': 'libweave_base',
- 'type': 'shared_library',
- 'include_dirs': [
- '../libweave/external',
- ],
- 'includes': [
- '../../../platform2/common-mk/deps.gypi',
- ],
- 'dependencies': [
- 'libweave_base_common',
- ],
- 'sources': [
- 'src/empty.cc'
- ],
- },
- {
- 'target_name': 'libweave_base-test',
- 'type': 'static_library',
- 'standalone_static_library': 1,
- 'include_dirs': [
- '../libweave/external',
- ],
- 'sources': [
- '<@(weave_test_sources)',
- ],
- 'includes': ['../../../platform2/common-mk/deps.gypi'],
- },
- ],
- 'conditions': [
- ['USE_test == 1', {
- 'targets': [
- {
- 'target_name': 'libweave_testrunner',
- 'type': 'executable',
- 'variables': {
- 'deps': [
- 'libchrome-<(libbase_ver)',
- ],
- },
- 'dependencies': [
- 'libweave_common',
- 'libweave-test-<(libbase_ver)',
- ],
- 'includes': ['../../../platform2/common-mk/common_test.gypi'],
- 'sources': [
- '<@(weave_unittest_sources)',
- ],
- },
- {
- 'target_name': 'libweave_base_testrunner',
- 'type': 'executable',
- 'cflags': ['-Wno-format-nonliteral'],
- 'include_dirs': [
- '../libweave/external',
- ],
- 'dependencies': [
- 'libweave_base_common',
- 'libweave_base-test',
- ],
- 'includes': ['../../../platform2/common-mk/common_test.gypi'],
- 'sources': [
- '<@(weave_unittest_sources)',
- '<@(base_unittests)',
- ],
- },
- {
- 'target_name': 'libweave_exports_testrunner',
- 'type': 'executable',
- 'variables': {
- 'deps': [
- 'libchrome-<(libbase_ver)',
- ],
- },
- 'dependencies': [
- 'libweave-<(libbase_ver)',
- 'libweave-test-<(libbase_ver)',
- ],
- 'includes': ['../../../platform2/common-mk/common_test.gypi'],
- 'sources': [
- '<@(weave_exports_unittest_sources)',
- ],
- },
- {
- 'target_name': 'libweave_base_exports_testrunner',
- 'type': 'executable',
- 'cflags': ['-Wno-format-nonliteral'],
- 'include_dirs': [
- '../libweave/external',
- ],
- 'dependencies': [
- 'libweave_base',
- 'libweave_base-test',
- ],
- 'includes': ['../../../platform2/common-mk/common_test.gypi'],
- 'sources': [
- '<@(weave_exports_unittest_sources)',
- ],
- },
- ],
- }],
- ],
-}
diff --git a/libweave/platform2_preinstall.sh b/libweave/platform2_preinstall.sh
deleted file mode 100755
index 84404d2..0000000
--- a/libweave/platform2_preinstall.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Copyright 2015 The Weave Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-set -e
-
-OUT=$1
-v=$2
-
-deps=$(<"${OUT}"/gen/libweave-${v}-deps.txt)
-sed \
- -e "s/@BSLOT@/${v}/g" \
- -e "s/@PRIVATE_PC@/${deps}/g" \
- "libweave.pc.in" > "${OUT}/lib/libweave-${v}.pc"
-
-
-deps_test=$(<"${OUT}"/gen/libweave-test-${v}-deps.txt)
-sed \
- -e "s/@BSLOT@/${v}/g" \
- -e "s/@PRIVATE_PC@/${deps_test}/g" \
- "libweave-test.pc.in" > "${OUT}/lib/libweave-test-${v}.pc"
