Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab73bcb4 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://android.git.kernel.org/platform/frameworks/base into eclair 

Conflicts:
	core/java/android/content/AbstractSyncableContentProvider.java
	telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
	telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
parents 0f00b20c 2e14ef04

Android.mk

+28 −13
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
framework_docs_LOCAL_JAVA_LIBRARIES := \

			core \

			ext \

			framework \



framework_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES

framework_docs_LOCAL_DROIDDOC_HTML_DIR := docs/html
@@ -345,6 +346,8 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/3.xml 3 \

    -since ./frameworks/base/api/4.xml 4 \

    -since ./frameworks/base/api/5.xml 5 \

    -since ./frameworks/base/api/6.xml 6 \

    -since ./frameworks/base/api/7.xml 7 \

		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -355,25 +358,35 @@ sample_dir := development/samples 
web_docs_sample_code_flags := \

		-hdf android.hasSamples 1 \

		-samplecode $(sample_dir)/ApiDemos \

		            guide/samples/ApiDemos "API Demos" \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/BluetoothChat \

		            resources/samples/BluetoothChat "Bluetooth Chat" \

		-samplecode $(sample_dir)/ContactManager \

		            resources/samples/ContactManager "Contact Manager" \

		-samplecode $(sample_dir)/Home \

		            guide/samples/Home "Home" \

		            resources/samples/Home "Home" \

		-samplecode $(sample_dir)/JetBoy \

		            guide/samples/JetBoy "JetBoy" \

		            resources/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/LunarLander \

		            guide/samples/LunarLander "Lunar Lander" \

		            resources/samples/LunarLander "Lunar Lander" \

		-samplecode $(sample_dir)/MultiResolution \

		            resources/samples/MultiResolution "Multiple Resolutions" \

		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad" \

		            resources/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/SearchableDictionary \

		            guide/samples/SearchableDictionary "Searchable Dictionary" \

		            resources/samples/SearchableDictionary "Searchable Dictionary" \

		-samplecode $(sample_dir)/Snake \

		            guide/samples/Snake "Snake" \

		            resources/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            guide/samples/SoftKeyboard "Soft Keyboard"

		            resources/samples/SoftKeyboard "Soft Keyboard" \

		-samplecode $(sample_dir)/Wiktionary \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

		            resources/samples/WiktionarySimple "Wiktionary (Simplified)"



## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

framework_docs_SDK_VERSION:=2.0

framework_docs_SDK_VERSION:=2.0.1

  # release version (ie "Release x")  (full releases only)

framework_docs_SDK_REL_ID:=1

  # name of current SDK directory (full releases only)
@@ -382,10 +395,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_ 
framework_docs_SDK_PREVIEW:=0



## Latest ADT version identifiers, for reference from published docs

framework_docs_ADT_VERSION:=0.9.4

framework_docs_ADT_DOWNLOAD:=ADT-0.9.4.zip

framework_docs_ADT_BYTES:=3367536

framework_docs_ADT_CHECKSUM:=4cdecd72b3e28022d8a55891f13e7d43

framework_docs_ADT_VERSION:=0.9.5

framework_docs_ADT_DOWNLOAD:=ADT-0.9.5.zip

framework_docs_ADT_BYTES:=3372982

framework_docs_ADT_CHECKSUM:=227ec538359fbe417ccde7f0ad614a96



framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \
@@ -439,6 +452,8 @@ LOCAL_MODULE := offline-sdk 


LOCAL_DROIDDOC_OPTIONS:=\

		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \

                $(web_docs_sample_code_flags) \

                -offlinemode \

		-title "Android SDK" \

		-proofread $(OUT_DOCS)/$(LOCAL_MODULE)-proofread.txt \

		-todo $(OUT_DOCS)/$(LOCAL_MODULE)-docs-todo.html \