From 4612763b441fc71dea1771b4821ec7b9500bdf43 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 19 Oct 2012 14:55:19 -0700 Subject: [PATCH] Update generate-NOTICE.py to know about tzdata. Also regenerate the NOTICE files. One had slipped behind. Bug: 7012465 Change-Id: Ice2e909b521472eb1acd53d8151038bebe19984a --- libc/NOTICE | 16 ---------------- libc/tools/generate-NOTICE.py | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/libc/NOTICE b/libc/NOTICE index 36d944981..6bfd15c02 100644 --- a/libc/NOTICE +++ b/libc/NOTICE @@ -65,22 +65,6 @@ SUCH DAMAGE. ------------------------------------------------------------------- -Copyright (C) 2007 The Android Open Source Project - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -------------------------------------------------------------------- - Copyright (C) 2008 The Android Open Source Project All rights reserved. diff --git a/libc/tools/generate-NOTICE.py b/libc/tools/generate-NOTICE.py index b7d23f733..5115317c1 100755 --- a/libc/tools/generate-NOTICE.py +++ b/libc/tools/generate-NOTICE.py @@ -20,7 +20,7 @@ def IsUninteresting(path): return True if path.endswith("/notice") or path.endswith("/readme") or path.endswith("/caveats"): return True - if path.endswith("/zoneinfo.dat") or path.endswith("/zoneinfo.idx") or path.endswith("/zoneinfo.version") or path.endswith("/zoneinfo/generate"): + if path.endswith("/tzdata") or path.endswith("/zoneinfo/generate"): return True return False