diff --git a/DEPS b/DEPS index fc491a32569..c8e58b9d04f 100644 --- a/DEPS +++ b/DEPS @@ -84,7 +84,7 @@ deps = { # and not have to specific specific hashes. 'src/lib/ftl': - Var('fuchsia_git') + '/ftl' + '@' + '438457e7c6325c2b2f36b7d3e9362687d9646fe2', + Var('fuchsia_git') + '/ftl' + '@' + '81aa1ca480c99caffbc2965deb0a6f7ac7f59f1c', 'src/lib/tonic': Var('fuchsia_git') + '/tonic' + '@' + '32e37b1478ea334ee215bd909cd35b85a6197c65', diff --git a/travis/licenses_golden/licenses_lib b/travis/licenses_golden/licenses_lib index 8c34fa8b3f8..e70e1b7f069 100644 --- a/travis/licenses_golden/licenses_lib +++ b/travis/licenses_golden/licenses_lib @@ -1,4 +1,4 @@ -Signature: 47344b5db8237aa29920f79f28de053a +Signature: d49f0e4fca74eb4aa6548a7e09bb31bf UNUSED LICENSES: @@ -43,6 +43,7 @@ FILE: ../../../lib/ftl/functional/auto_call.h FILE: ../../../lib/ftl/functional/closure.h FILE: ../../../lib/ftl/functional/make_copyable.h FILE: ../../../lib/ftl/functional/make_copyable_unittest.cc +FILE: ../../../lib/ftl/functional/make_runnable.h FILE: ../../../lib/ftl/log_level.h FILE: ../../../lib/ftl/log_settings.cc FILE: ../../../lib/ftl/log_settings.h @@ -91,10 +92,6 @@ FILE: ../../../lib/ftl/strings/utf_codecs.h FILE: ../../../lib/ftl/synchronization/cond_var.h FILE: ../../../lib/ftl/synchronization/cond_var_posix.cc FILE: ../../../lib/ftl/synchronization/cond_var_unittest.cc -FILE: ../../../lib/ftl/synchronization/monitor.cc -FILE: ../../../lib/ftl/synchronization/monitor.h -FILE: ../../../lib/ftl/synchronization/mutex.h -FILE: ../../../lib/ftl/synchronization/mutex_posix.cc FILE: ../../../lib/ftl/synchronization/mutex_unittest.cc FILE: ../../../lib/ftl/synchronization/sleep.cc FILE: ../../../lib/ftl/synchronization/sleep.h @@ -185,13 +182,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== LIBRARY: ftl -ORIGIN: ../../../lib/ftl/files/directory_unittest.cc + ../../../lib/ftl/LICENSE +ORIGIN: ../../../lib/ftl/files/path_win.cc + ../../../lib/ftl/LICENSE TYPE: LicenseType.bsd -FILE: ../../../lib/ftl/files/directory_unittest.cc -FILE: ../../../lib/ftl/files/file_descriptor_unittest.cc FILE: ../../../lib/ftl/files/path_win.cc FILE: ../../../lib/ftl/files/symlink_win.cc -FILE: ../../../lib/ftl/ftl_export.h FILE: ../../../lib/ftl/functional/apply.h FILE: ../../../lib/ftl/functional/apply_unittest.cc FILE: ../../../lib/ftl/functional/auto_call_unittest.cc @@ -200,17 +194,11 @@ FILE: ../../../lib/ftl/functional/cancelable_callback_unittest.cc FILE: ../../../lib/ftl/inttypes.h FILE: ../../../lib/ftl/portable_unistd.h FILE: ../../../lib/ftl/random/rand_unittest.cc -FILE: ../../../lib/ftl/random/uuid_unittest.cc FILE: ../../../lib/ftl/strings/join_strings.h FILE: ../../../lib/ftl/strings/join_strings_unittest.cc FILE: ../../../lib/ftl/synchronization/cond_var_win.cc -FILE: ../../../lib/ftl/synchronization/mutex_win.cc FILE: ../../../lib/ftl/threading/thread.cc FILE: ../../../lib/ftl/threading/thread.h -FILE: ../../../lib/ftl/threading/thread_unittest.cc -FILE: ../../../lib/ftl/time/stopwatch_unittest.cc -FILE: ../../../lib/ftl/time/time_delta_unittest.cc -FILE: ../../../lib/ftl/time/time_point_unittest.cc ---------------------------------------------------------------------------------------------------- Copyright 2017 The Fuchsia Authors. All rights reserved. @@ -241,6 +229,79 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== +==================================================================================================== +LIBRARY: ftl +ORIGIN: ../../../lib/ftl/synchronization/monitor.cc + ../../../lib/ftl/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../lib/ftl/synchronization/monitor.cc +FILE: ../../../lib/ftl/synchronization/monitor.h +FILE: ../../../lib/ftl/synchronization/mutex.h +FILE: ../../../lib/ftl/synchronization/mutex_posix.cc +---------------------------------------------------------------------------------------------------- +Copyright 2016 The Fuchisa Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. 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 +OWNER 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. +==================================================================================================== + +==================================================================================================== +LIBRARY: ftl +ORIGIN: ../../../lib/ftl/synchronization/mutex_win.cc + ../../../lib/ftl/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../lib/ftl/synchronization/mutex_win.cc +---------------------------------------------------------------------------------------------------- +Copyright 2017 The Fuchisa Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * 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. + * Neither the name of Google Inc. 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 +OWNER 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. +==================================================================================================== + ==================================================================================================== LIBRARY: icu ORIGIN: ../../../lib/ftl/third_party/icu/LICENSE @@ -338,4 +399,4 @@ 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. ==================================================================================================== -Total license count: 4 +Total license count: 6