From 73e37b535a611fe90e43ebedeff91ce8b1fa529f Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 4 Oct 2023 22:01:52 +0000 Subject: [PATCH] Reduce duplication in the NOTICE file. Test: treehugger Change-Id: I8a9c4f22534330dd498636a155b872bd2d2af5b6 --- libc/NOTICE | 29 ----------------------------- libc/include/time64.h | 3 --- 2 files changed, 32 deletions(-) diff --git a/libc/NOTICE b/libc/NOTICE index daea7bc218..ef64e0c616 100644 --- a/libc/NOTICE +++ b/libc/NOTICE @@ -3848,35 +3848,6 @@ THE SOFTWARE. ------------------------------------------------------------------- -Copyright (c) 2007-2008 Michael G Schwern - -This software originally derived from Paul Sheer's pivotal_gmtime_r.c. - -The MIT License: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -Origin: http://code.google.com/p/y2038 -Modified for Bionic by the Android Open Source Project - -------------------------------------------------------------------- - Copyright (c) 2008, 2016 Todd C. Miller Permission to use, copy, modify, and distribute this software for any diff --git a/libc/include/time64.h b/libc/include/time64.h index 7d700309eb..8d31c6f714 100644 --- a/libc/include/time64.h +++ b/libc/include/time64.h @@ -24,9 +24,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Origin: http://code.google.com/p/y2038 -Modified for Bionic by the Android Open Source Project - */ #ifndef TIME64_H #define TIME64_H