tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Reduce duplication in the NOTICE file." into main am: 22743e3a7e am: f8d775b943 am: ce7fe40659 am: 9fc4c42656

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2773704

Change-Id: I8e0265d37cef48007d73412f79fdfcecd3b396aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-10-05 02:22:08 +00:00 committed by Automerger Merge Worker
commit 4023666514
2 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libc/NOTICE
View file

@ -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 <millert@openbsd.org>
Permission to use, copy, modify, and distribute this software for any

3
libc/include/time64.h
View file

@ -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