Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD (66ed50af) · Commits · e / os / android_system_core

CleanSpec.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,3 +50,4 @@

		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/reboot)

MODULE_LICENSE_APACHE2

0 → 100644

+0 −0

Empty file added.

NOTICE

0 → 100644

+324 −0

Original line number	Diff line number	Diff line
		=========================================================================
		== NOTICE file corresponding to the section 4 d of ==
		== the Apache License, Version 2.0, ==
		== in this case for the Android-specific code. ==
		=========================================================================

		Android Code
		Copyright 2005-2008 The Android Open Source Project

		This product includes software developed as part of
		The Android Open Source Project (http://source.android.com).

		=========================================================================
		== NOTICE file corresponding to the section 4 d of ==
		== the Apache License, Version 2.0, ==
		== in this case for Apache Commons code. ==
		=========================================================================

		Apache Commons
		Copyright 1999-2006 The Apache Software Foundation

		This product includes software developed at
		The Apache Software Foundation (http://www.apache.org/).

		=========================================================================
		== NOTICE file corresponding to the section 4 d of ==
		== the Apache License, Version 2.0, ==
		== in this case for Jakarta Commons Logging. ==
		=========================================================================

		Jakarta Commons Logging (JCL)
		Copyright 2005,2006 The Apache Software Foundation.

		This product includes software developed at
		The Apache Software Foundation (http://www.apache.org/).

		=========================================================================
		== NOTICE file corresponding to the section 4 d of ==
		== the Apache License, Version 2.0, ==
		== in this case for the Nuance code. ==
		=========================================================================

		These files are Copyright 2007 Nuance Communications, 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 Media Codecs code. ==
		=========================================================================

		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.

		=========================================================================
		== NOTICE file corresponding to the section 4 d of ==
		== the Apache License, Version 2.0, ==
		== in this case for Additional Codecs code. ==
		=========================================================================

		Additional Codecs
		These files are Copyright 2003-2010 VisualOn, 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 Audio Effects code. ==
		=========================================================================

		Audio Effects
		These files are Copyright (C) 2004-2010 NXP Software and
		Copyright (C) 2010 The Android Open Source Project, but released under
		the Apache2 License.


		Apache License
		Version 2.0, January 2004
		http://www.apache.org/licenses/

		TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

		1. Definitions.

		"License" shall mean the terms and conditions for use, reproduction,
		and distribution as defined by Sections 1 through 9 of this document.

		"Licensor" shall mean the copyright owner or entity authorized by
		the copyright owner that is granting the License.

		"Legal Entity" shall mean the union of the acting entity and all
		other entities that control, are controlled by, or are under common
		control with that entity. For the purposes of this definition,
		"control" means (i) the power, direct or indirect, to cause the
		direction or management of such entity, whether by contract or
		otherwise, or (ii) ownership of fifty percent (50%) or more of the
		outstanding shares, or (iii) beneficial ownership of such entity.

		"You" (or "Your") shall mean an individual or Legal Entity
		exercising permissions granted by this License.

		"Source" form shall mean the preferred form for making modifications,
		including but not limited to software source code, documentation
		source, and configuration files.

		"Object" form shall mean any form resulting from mechanical
		transformation or translation of a Source form, including but
		not limited to compiled object code, generated documentation,
		and conversions to other media types.

		"Work" shall mean the work of authorship, whether in Source or
		Object form, made available under the License, as indicated by a
		copyright notice that is included in or attached to the work
		(an example is provided in the Appendix below).

		"Derivative Works" shall mean any work, whether in Source or Object
		form, that is based on (or derived from) the Work and for which the
		editorial revisions, annotations, elaborations, or other modifications
		represent, as a whole, an original work of authorship. For the purposes
		of this License, Derivative Works shall not include works that remain
		separable from, or merely link (or bind by name) to the interfaces of,
		the Work and Derivative Works thereof.

		"Contribution" shall mean any work of authorship, including
		the original version of the Work and any modifications or additions
		to that Work or Derivative Works thereof, that is intentionally
		submitted to Licensor for inclusion in the Work by the copyright owner
		or by an individual or Legal Entity authorized to submit on behalf of
		the copyright owner. For the purposes of this definition, "submitted"
		means any form of electronic, verbal, or written communication sent
		to the Licensor or its representatives, including but not limited to
		communication on electronic mailing lists, source code control systems,
		and issue tracking systems that are managed by, or on behalf of, the
		Licensor for the purpose of discussing and improving the Work, but
		excluding communication that is conspicuously marked or otherwise
		designated in writing by the copyright owner as "Not a Contribution."

		"Contributor" shall mean Licensor and any individual or Legal Entity
		on behalf of whom a Contribution has been received by Licensor and
		subsequently incorporated within the Work.

		2. Grant of Copyright License. Subject to the terms and conditions of
		this License, each Contributor hereby grants to You a perpetual,
		worldwide, non-exclusive, no-charge, royalty-free, irrevocable
		copyright license to reproduce, prepare Derivative Works of,
		publicly display, publicly perform, sublicense, and distribute the
		Work and such Derivative Works in Source or Object form.

		3. Grant of Patent License. Subject to the terms and conditions of
		this License, each Contributor hereby grants to You a perpetual,
		worldwide, non-exclusive, no-charge, royalty-free, irrevocable
		(except as stated in this section) patent license to make, have made,
		use, offer to sell, sell, import, and otherwise transfer the Work,
		where such license applies only to those patent claims licensable
		by such Contributor that are necessarily infringed by their
		Contribution(s) alone or by combination of their Contribution(s)
		with the Work to which such Contribution(s) was submitted. If You
		institute patent litigation against any entity (including a
		cross-claim or counterclaim in a lawsuit) alleging that the Work
		or a Contribution incorporated within the Work constitutes direct
		or contributory patent infringement, then any patent licenses
		granted to You under this License for that Work shall terminate
		as of the date such litigation is filed.

		4. Redistribution. You may reproduce and distribute copies of the
		Work or Derivative Works thereof in any medium, with or without
		modifications, and in Source or Object form, provided that You
		meet the following conditions:

		(a) You must give any other recipients of the Work or
		Derivative Works a copy of this License; and

		(b) You must cause any modified files to carry prominent notices
		stating that You changed the files; and

		(c) You must retain, in the Source form of any Derivative Works
		that You distribute, all copyright, patent, trademark, and
		attribution notices from the Source form of the Work,
		excluding those notices that do not pertain to any part of
		the Derivative Works; and

		(d) If the Work includes a "NOTICE" text file as part of its
		distribution, then any Derivative Works that You distribute must
		include a readable copy of the attribution notices contained
		within such NOTICE file, excluding those notices that do not
		pertain to any part of the Derivative Works, in at least one
		of the following places: within a NOTICE text file distributed
		as part of the Derivative Works; within the Source form or
		documentation, if provided along with the Derivative Works; or,
		within a display generated by the Derivative Works, if and
		wherever such third-party notices normally appear. The contents
		of the NOTICE file are for informational purposes only and
		do not modify the License. You may add Your own attribution
		notices within Derivative Works that You distribute, alongside
		or as an addendum to the NOTICE text from the Work, provided
		that such additional attribution notices cannot be construed
		as modifying the License.

		You may add Your own copyright statement to Your modifications and
		may provide additional or different license terms and conditions
		for use, reproduction, or distribution of Your modifications, or
		for any such Derivative Works as a whole, provided Your use,
		reproduction, and distribution of the Work otherwise complies with
		the conditions stated in this License.

		5. Submission of Contributions. Unless You explicitly state otherwise,
		any Contribution intentionally submitted for inclusion in the Work
		by You to the Licensor shall be under the terms and conditions of
		this License, without any additional terms or conditions.
		Notwithstanding the above, nothing herein shall supersede or modify
		the terms of any separate license agreement you may have executed
		with Licensor regarding such Contributions.

		6. Trademarks. This License does not grant permission to use the trade
		names, trademarks, service marks, or product names of the Licensor,
		except as required for reasonable and customary use in describing the
		origin of the Work and reproducing the content of the NOTICE file.

		7. Disclaimer of Warranty. Unless required by applicable law or
		agreed to in writing, Licensor provides the Work (and each
		Contributor provides its Contributions) on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
		implied, including, without limitation, any warranties or conditions
		of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
		PARTICULAR PURPOSE. You are solely responsible for determining the
		appropriateness of using or redistributing the Work and assume any
		risks associated with Your exercise of permissions under this License.

		8. Limitation of Liability. In no event and under no legal theory,
		whether in tort (including negligence), contract, or otherwise,
		unless required by applicable law (such as deliberate and grossly
		negligent acts) or agreed to in writing, shall any Contributor be
		liable to You for damages, including any direct, indirect, special,
		incidental, or consequential damages of any character arising as a
		result of this License or out of the use or inability to use the
		Work (including but not limited to damages for loss of goodwill,
		work stoppage, computer failure or malfunction, or any and all
		other commercial damages or losses), even if such Contributor
		has been advised of the possibility of such damages.

		9. Accepting Warranty or Additional Liability. While redistributing
		the Work or Derivative Works thereof, You may choose to offer,
		and charge a fee for, acceptance of support, warranty, indemnity,
		or other liability obligations and/or rights consistent with this
		License. However, in accepting such obligations, You may act only
		on Your own behalf and on Your sole responsibility, not on behalf
		of any other Contributor, and only if You agree to indemnify,
		defend, and hold each Contributor harmless for any liability
		incurred by, or claims asserted against, such Contributor by reason
		of your accepting any such warranty or additional liability.

		END OF TERMS AND CONDITIONS



		UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE

		Unicode Data Files include all data files under the directories
		http://www.unicode.org/Public/, http://www.unicode.org/reports/,
		and http://www.unicode.org/cldr/data/ . Unicode Software includes any
		source code published in the Unicode Standard or under the directories
		http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
		http://www.unicode.org/cldr/data/.

		NOTICE TO USER: Carefully read the following legal agreement. BY
		DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA
		FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY
		ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF
		THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY,
		DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.

		COPYRIGHT AND PERMISSION NOTICE

		Copyright © 1991-2008 Unicode, Inc. All rights reserved. Distributed
		under the Terms of Use in http://www.unicode.org/copyright.html.

		Permission is hereby granted, free of charge, to any person obtaining
		a copy of the Unicode data files and any associated documentation (the
		"Data Files") or Unicode software and any associated documentation (the
		"Software") to deal in the Data Files or Software without restriction,
		including without limitation the rights to use, copy, modify, merge,
		publish, distribute, and/or sell copies of the Data Files or Software,
		and to permit persons to whom the Data Files or Software are furnished to
		do so, provided that (a) the above copyright notice(s) and this permission
		notice appear with all copies of the Data Files or Software, (b) both the
		above copyright notice(s) and this permission notice appear in associated
		documentation, and (c) there is clear notice in each modified Data File
		or in the Software as well as in the documentation associated with the
		Data File(s) or Software that the data or software has been modified.

		THE DATA FILES AND SOFTWARE ARE 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
		OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
		INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
		OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
		OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
		OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
		OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.

		Except as contained in this notice, the name of a copyright holder
		shall not be used in advertising or otherwise to promote the sale, use
		or other dealings in these Data Files or Software without prior written
		authorization of the copyright holder.

adb/Android.mk

+2 −5

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ LOCAL_SRC_FILES := \
		file_sync_client.c \
		$(EXTRA_SRCS) \
		$(USB_SRCS) \
		utils.c \
		usb_vendors.c

		LOCAL_C_INCLUDES += external/openssl/include
		@@ -116,8 +115,7 @@ LOCAL_SRC_FILES := \
		framebuffer_service.c \
		remount_service.c \
		usb_linux_client.c \
		log_service.c \
		utils.c
		log_service.c

		LOCAL_CFLAGS := -O2 -g -DADB_HOST=0 -Wall -Wno-unused-parameter
		LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE
		@@ -132,7 +130,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
		LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
		LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)

		LOCAL_STATIC_LIBRARIES := libcutils libc libmincrypt
		LOCAL_STATIC_LIBRARIES := liblog libcutils libc libmincrypt
		include $(BUILD_EXECUTABLE)


		@@ -157,7 +155,6 @@ LOCAL_SRC_FILES := \
		file_sync_client.c \
		get_my_path_linux.c \
		usb_linux.c \
		utils.c \
		usb_vendors.c \
		fdevent.c

adb/SERVICES.TXT

+0 −21

Original line number	Diff line number	Diff line
		@@ -225,27 +225,6 @@ framebuffer:
		If the adbd daemon doesn't have sufficient privileges to open
		the framebuffer device, the connection is simply closed immediately.

		dns:<server-name>
		This service is an exception because it only runs within the ADB server.
		It is used to implement USB networking, i.e. to provide a network connection
		to the device through the host machine (note: this is the exact opposite of
		network tethering).

		It is used to perform a gethostbyname(<address>) on the host and return
		the corresponding IP address as a 4-byte string.

		recover:<size>
		This service is used to upload a recovery image to the device. <size>
		must be a number corresponding to the size of the file. The service works
		by:

		- creating a file named /tmp/update
		- reading 'size' bytes from the client and writing them to /tmp/update
		- when everything is read successfully, create a file named /tmp/update.start

		This service can only work when the device is in recovery mode. Otherwise,
		the /tmp directory doesn't exist and the connection will be closed immediately.

		jdwp:<pid>
		Connects to the JDWP thread running in the VM of process <pid>.