Merge korg/donut into korg/master (2af1b3db) · Commits · e / os / android_frameworks_base

Android.mk

+66 −18

Original line number	Diff line number	Diff line
		@@ -41,9 +41,21 @@ LOCAL_SRC_FILES := $(filter-out \
		org/mobilecontrol/% \
		,$(LOCAL_SRC_FILES))

		# Include a different set of source files when building a debug build.
		# TODO: Maybe build these into a separate .jar and put it on the classpath
		# in front of framework.jar.
		# NOTE: Do not use this as an example; this is a very special situation.
		# Do not modify LOCAL_SRC_FILES based on any variable other
		# than TARGET_BUILD_TYPE, otherwise builds can become inconsistent.
		ifeq ($(TARGET_BUILD_TYPE),debug)
		LOCAL_SRC_FILES += $(call find-other-java-files,core/config/debug)
		else
		LOCAL_SRC_FILES += $(call find-other-java-files,core/config/ndebug)
		endif

		## READ ME: ########################################################
		##
		## When updading this list of aidl files, consider if that aidl is
		## When updating this list of aidl files, consider if that aidl is
		## part of the SDK API. If it is, also add it to the list below that
		## is preprocessed and distributed with the SDK. This list should
		## not contain any aidl files for parcelables, but the one below should
		@@ -52,27 +64,36 @@ LOCAL_SRC_FILES := $(filter-out \
		##
		## READ ME: ########################################################
		LOCAL_SRC_FILES += \
		core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl \
		core/java/android/accessibilityservice/IEventListener.aidl \
		core/java/android/accounts/IAccountsService.aidl \
		core/java/android/app/IActivityPendingResult.aidl \
		core/java/android/app/IActivityWatcher.aidl \
		core/java/android/app/IAlarmManager.aidl \
		core/java/android/app/IBackupAgent.aidl \
		core/java/android/app/IInstrumentationWatcher.aidl \
		core/java/android/app/IIntentReceiver.aidl \
		core/java/android/app/IIntentSender.aidl \
		core/java/android/app/INotificationManager.aidl \
		core/java/android/app/ISearchManager.aidl \
		core/java/android/app/ISearchManagerCallback.aidl \
		core/java/android/app/IServiceConnection.aidl \
		core/java/android/app/IStatusBar.aidl \
		core/java/android/app/IThumbnailReceiver.aidl \
		core/java/android/app/ITransientNotification.aidl \
		core/java/android/app/IWallpaperService.aidl \
		core/java/android/app/IWallpaperServiceCallback.aidl \
		core/java/android/backup/IBackupManager.aidl \
		core/java/android/backup/IRestoreObserver.aidl \
		core/java/android/backup/IRestoreSession.aidl \
		core/java/android/bluetooth/IBluetoothA2dp.aidl \
		core/java/android/bluetooth/IBluetoothDevice.aidl \
		core/java/android/bluetooth/IBluetoothDeviceCallback.aidl \
		core/java/android/bluetooth/IBluetoothHeadset.aidl \
		core/java/android/content/IContentService.aidl \
		core/java/android/content/IIntentReceiver.aidl \
		core/java/android/content/IIntentSender.aidl \
		core/java/android/content/ISyncAdapter.aidl \
		core/java/android/content/ISyncContext.aidl \
		core/java/android/content/ISyncStatusObserver.aidl \
		core/java/android/content/pm/IPackageDataObserver.aidl \
		core/java/android/content/pm/IPackageDeleteObserver.aidl \
		core/java/android/content/pm/IPackageInstallObserver.aidl \
		@@ -90,16 +111,23 @@ LOCAL_SRC_FILES += \
		core/java/android/os/IPermissionController.aidl \
		core/java/android/os/IPowerManager.aidl \
		core/java/android/text/IClipboard.aidl \
		core/java/android/view/accessibility/IAccessibilityManager.aidl \
		core/java/android/view/accessibility/IAccessibilityManagerClient.aidl \
		core/java/android/view/IApplicationToken.aidl \
		core/java/android/view/IOnKeyguardExitResult.aidl \
		core/java/android/view/IRotationWatcher.aidl \
		core/java/android/view/IWindow.aidl \
		core/java/android/view/IWindowManager.aidl \
		core/java/android/view/IWindowSession.aidl \
		core/java/android/speech/IRecognitionListener.aidl \
		core/java/android/speech/IRecognitionService.aidl \
		core/java/android/speech/tts/ITts.aidl \
		core/java/android/speech/tts/ITtsCallback.aidl \
		core/java/com/android/internal/app/IBatteryStats.aidl \
		core/java/com/android/internal/app/IUsageStats.aidl \
		core/java/com/android/internal/appwidget/IAppWidgetService.aidl \
		core/java/com/android/internal/appwidget/IAppWidgetHost.aidl \
		core/java/com/android/internal/backup/IBackupTransport.aidl \
		core/java/com/android/internal/os/IResultReceiver.aidl \
		core/java/com/android/internal/view/IInputContext.aidl \
		core/java/com/android/internal/view/IInputContextCallback.aidl \
		@@ -109,9 +137,12 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/view/IInputMethodManager.aidl \
		core/java/com/android/internal/view/IInputMethodSession.aidl \
		im/java/android/im/IImPlugin.aidl \
		location/java/android/location/IGeocodeProvider.aidl \
		location/java/android/location/IGpsStatusListener.aidl \
		location/java/android/location/IGpsStatusProvider.aidl \
		location/java/android/location/ILocationListener.aidl \
		location/java/android/location/ILocationManager.aidl \
		location/java/android/location/ILocationProvider.aidl \
		media/java/android/media/IAudioService.aidl \
		media/java/android/media/IMediaScannerListener.aidl \
		media/java/android/media/IMediaScannerService.aidl \
		@@ -119,10 +150,11 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
		telephony/java/com/android/internal/telephony/ITelephony.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/gsm/ISimPhoneBook.aidl \
		telephony/java/com/android/internal/telephony/gsm/ISms.aidl \
		telephony/java/com/android/internal/telephony/IIccPhoneBook.aidl \
		telephony/java/com/android/internal/telephony/ISms.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl
		telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \
		vpn/java/android/net/vpn/IVpnService.aidl \

		# FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
		LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
		@@ -167,6 +199,7 @@ aidl_files := \
		frameworks/base/core/java/android/app/PendingIntent.aidl \
		frameworks/base/core/java/android/content/ComponentName.aidl \
		frameworks/base/core/java/android/content/Intent.aidl \
		frameworks/base/core/java/android/content/IntentSender.aidl \
		frameworks/base/core/java/android/content/SyncStats.aidl \
		frameworks/base/core/java/android/content/res/Configuration.aidl \
		frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \
		@@ -192,7 +225,8 @@ aidl_files := \
		frameworks/base/location/java/android/location/Location.aidl \
		frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
		frameworks/base/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
		frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl
		frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl \
		frameworks/base/vpn/java/android/net/vpn/IVpnService.aidl \

		gen := $(TARGET_OUT_COMMON_INTERMEDIATES)/framework.aidl
		$(gen): PRIVATE_SRC_FILES := $(aidl_files)
		@@ -221,6 +255,11 @@ fwbase_dirs_to_document := \
		) \
		)

		# Pass a special "fake-out" version of some classes to the doc/API tools.
		# ConfigBuildFlags uses this trick to prevent certain fields from appearing
		# as "final" in the official SDK APIs.
		fwbase_dirs_to_document += core/config/sdk

		# These are relative to dalvik/libcore
		# Intentionally not included from libcore:
		# icu openssl suncompat support
		@@ -292,12 +331,6 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \

		framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:=$(call intermediates-dir-for,JAVA_LIBRARIES,framework)

		web_docs_sample_code_flags := \
		-hdf android.hasSamples 1 \
		-samplecode samples/ApiDemos guide/samples/ApiDemos "API Demos" \
		-samplecode samples/LunarLander guide/samples/LunarLander "Lunar Lander" \
		-samplecode samples/NotePad guide/samples/NotePad "Note Pad"

		sample_dir := development/samples

		web_docs_sample_code_flags := \
		@@ -309,6 +342,19 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/NotePad \
		guide/samples/NotePad "Note Pad"

		# SDK version identifiers used in the published docs.

		# major[.minor] version for SDK. Typically identical to the
		# most current Android platform version included in the SDK package.
		framework_docs_SDK_VERSION := 1.5
		# release version for SDK (ie "Release x")
		framework_docs_SDK_REL_ID := 2
		framework_docs_SDK_CURRENT_DIR := $(framework_docs_SDK_VERSION)_r$(framework_docs_SDK_REL_ID)

		framework_docs_LOCAL_DROIDDOC_OPTIONS += \
		-hdf sdk.version $(framework_docs_SDK_VERSION) \
		-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \
		-hdf sdk.current $(framework_docs_SDK_CURRENT_DIR)

		# ==== static html in the sdk ==================================
		include $(CLEAR_VARS)
		@@ -432,3 +478,5 @@ include $(BUILD_JAVA_LIBRARY)
		ifeq (,$(ONE_SHOT_MAKEFILE))
		include $(call first-makefiles-under,$(LOCAL_PATH))
		endif

NOTICE

+51 −0

Original line number	Diff line number	Diff line
		@@ -220,3 +220,54 @@ the Apache2 License.

		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.

api/1.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -88531,7 +88531,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="predicates" type="com.android.internal.util.Predicate...">
		<parameter name="predicates" type="com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...">
		</parameter>
		</method>
		<method name="build"
		@@ -169208,7 +169208,7 @@
		>
		<parameter name="loader" type="java.lang.ClassLoader">
		</parameter>
		<parameter name="interfaces" type="java.lang.Class...">
		<parameter name="interfaces" type="java.lang.Class<?>...">
		</parameter>
		<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
		</exception>

api/2.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -88575,7 +88575,7 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="predicates" type="com.android.internal.util.Predicate...">
		<parameter name="predicates" type="com.android.internal.util.Predicate<android.test.suitebuilder.TestMethod>...">
		</parameter>
		</method>
		<method name="build"
		@@ -169353,7 +169353,7 @@
		>
		<parameter name="loader" type="java.lang.ClassLoader">
		</parameter>
		<parameter name="interfaces" type="java.lang.Class...">
		<parameter name="interfaces" type="java.lang.Class<?>...">
		</parameter>
		<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
		</exception>

api/4.xml

0 → 100644

+334737 −0

File added.

Preview size limit exceeded, changes collapsed.