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

Commit abdc514b authored by Dirk Dougherty's avatar Dirk Dougherty Committed by The Android Open Source Project
Browse files

Merge branch 'readonly-p4-donut' into donut

parents a0c9e852 e90232b1

Android.mk

+18 −11
Original line number Original line Diff line number Diff line
@@ -297,12 +297,6 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 




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

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

sample_dir := development/samples





web_docs_sample_code_flags := \

web_docs_sample_code_flags := \
@@ -314,6 +308,19 @@ web_docs_sample_code_flags := \ 
		-samplecode $(sample_dir)/NotePad \

		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad"

		            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 :=   1

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 ==================================

# ====  static html in the sdk ==================================

include $(CLEAR_VARS)

include $(CLEAR_VARS)

docs/html/offline.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -9,10 +9,10 @@ page.title=Welcome 
<img src="{@docRoot}images/android_icon_125.png" style="float:right; margin:1em 6em 6em;" />

<img src="{@docRoot}images/android_icon_125.png" style="float:right; margin:1em 6em 6em;" />





<p>If you've just downloaded the SDK, then continue with  

<p>If you've just downloaded the SDK, then continue with  

<a href="{@docRoot}sdk/1.1_r1/installing.html">Installing the Android SDK</a>.</p>

<a href="{@docRoot}sdk/{@sdkCurrent}/installing.html">Installing the Android SDK</a>.</p>





<p>If you're upgrading from a previously installed version, then refer to the 

<p>If you're upgrading from a previously installed version, then refer to the 

<a href="{@docRoot}sdk/1.1_r1/upgrading.html">Upgrading</a> guide.</p>

<a href="{@docRoot}sdk/{@sdkCurrent}/upgrading.html">Upgrading</a> guide.</p>





<p>Once you've completed the SDK installation, you can start learning about

<p>Once you've completed the SDK installation, you can start learning about

development on the Android framework by reading the <a

development on the Android framework by reading the <a