Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing NOTICE entries.

Browse Source 
Add missing NOTICE block for TagSoup in general NOTICE file.
Add comment in Android.mk to help reviewers locate the NOTICE for apache-http.
Modify build rule for 'am' command to pull in the NOTICE file.

Change-Id: I43c6c1468395b70d0942b3620f12e4b6f3d9a66b
This commit is contained in:
David Deephanphongs
2010-10-19 14:54:05 -07:00
committed by Jean-Baptiste Queru
parent 99291b95b2
commit 62f2ada64f
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@@ -607,6 +607,10 @@ include $(BUILD_DROIDDOC)
# Build ext.jar
# ============================================================
# NOTICE notes for non-obvious sections
# apache-http - covered by the Apache Commons section.
ext_dirs := \
../../external/nist-sip/java \
../../external/apache-http/src \

22
NOTICE
View File

@@ -17,7 +17,7 @@ The Android Open Source Project (http://source.android.com).
=========================================================================
Apache Commons
Copyright 1999-2004 The Apache Software Foundation
Copyright 1999-2006 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -53,6 +53,26 @@ Media Codecs
These files are Copyright 1998 - 2009 PacketVideo, but released under
the Apache2 License.
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the TagSoup code. ==
=========================================================================
This file is part of TagSoup and is Copyright 2002-2008 by John Cowan.
TagSoup is licensed under the Apache License,
Version 2.0. You may obtain a copy of this license at
http://www.apache.org/licenses/LICENSE-2.0 . You may also have
additional legal rights not granted by this license.
TagSoup is distributed in the hope that it will be useful, but
unless required by applicable law or agreed to in writing, TagSoup
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied; not even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

17
cmds/am/Android.mk
View File

@@ -12,3 +12,20 @@ ALL_PREBUILT += $(TARGET_OUT)/bin/am
$(TARGET_OUT)/bin/am : $(LOCAL_PATH)/am | $(ACP)
$(transform-prebuilt-to-target)
NOTICE_FILE := NOTICE
files_noticed := bin/am
# Generate rules for a single file. The argument is the file path relative to
# the installation root
define make-notice-file
$(TARGET_OUT_NOTICE_FILES)/src/$(1).txt: $(LOCAL_PATH)/$(NOTICE_FILE)
@echo Notice file: $$< -- $$@
@mkdir -p $$(dir $$@)
@cat $$< >> $$@
$(TARGET_OUT_NOTICE_FILES)/hash-timestamp: $(TARGET_OUT_NOTICE_FILES)/src/$(1).txt
endef
$(foreach file,$(files_noticed),$(eval $(call make-notice-file,$(file))))