From 1b86d75d312996133bc0c74fcb1f2c9f2a83fba0 Mon Sep 17 00:00:00 2001 From: Makoto Onuki Date: Thu, 29 Nov 2012 11:05:42 -0800 Subject: Remove unused IExtendedNetworkService It was used in the cupcake era for docomo. Is not used anymore. Bug 7633569 Change-Id: I2ec826fc9a70d261a340957a937ed4c9f8e67c5c --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index d38150f..0fdc3b1 100644 --- a/Android.mk +++ b/Android.mk @@ -218,7 +218,6 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/internal/telephony/ITelephony.aidl \ telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \ telephony/java/com/android/internal/telephony/IWapPushManager.aidl \ - telephony/java/com/android/internal/telephony/IExtendedNetworkService.aidl \ wifi/java/android/net/wifi/IWifiManager.aidl \ wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \ voip/java/android/net/sip/ISipSession.aidl \ -- cgit v1.1 From 289ad99c17bd4eda0d2c153732e755a8a956609e Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Mon, 28 Jan 2013 15:43:49 -0800 Subject: Add build rule for ds (devsite) online docs. Change-Id: I4f1d099995402613f58401a506ba272abfb563ba --- Android.mk | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index d38150f..09a7add 100644 --- a/Android.mk +++ b/Android.mk @@ -647,7 +647,7 @@ $(static_doc_index_redirect): \ $(full_target): $(static_doc_index_redirect) $(full_target): $(framework_built) -# ==== docs for the web (on the google app engine server) ======================= +# ==== docs for the web (on the androiddevdocs app engine server) ======================= include $(CLEAR_VARS) LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) @@ -676,6 +676,36 @@ include $(BUILD_DROIDDOC) # explicitly specify that online-sdk depends on framework-res and any generated docs $(full_target): framework-res-package-target +# ==== docs for the web (on the devsite app engine server) ======================= +include $(CLEAR_VARS) +LOCAL_SRC_FILES:=$(framework_docs_LOCAL_SRC_FILES) +LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_STATIC_JAVA_LIBRARIES:=$(framework_docs_LOCAL_STATIC_JAVA_LIBRARIES) +LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) +LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS) +LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH) +LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR) +LOCAL_ADDITIONAL_JAVA_DIR:=$(framework_docs_LOCAL_ADDITIONAL_JAVA_DIR) +LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES) +# specify a second html input dir and an output path relative to OUT_DIR) +LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl / + +LOCAL_MODULE := ds + +LOCAL_DROIDDOC_OPTIONS:= \ + $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ + $(web_docs_sample_code_flags) \ + -devsite \ + -toroot / \ + -hdf android.whichdoc online + +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ds + +include $(BUILD_DROIDDOC) + +# explicitly specify that ds depends on framework-res and any generated docs +$(full_target): framework-res-package-target + # ==== docs that have all of the stuff that's @hidden ======================= include $(CLEAR_VARS) -- cgit v1.1 From e75cd4bfd176fbb1483ec5e17edfbd993adce40f Mon Sep 17 00:00:00 2001 From: Scott Main Date: Tue, 29 Jan 2013 08:29:40 -0800 Subject: docs: add hdf bool for deviste, used to change aspects of the templates Change-Id: I6ad24252f10211a88d1f98e356bc9da97442f91c --- Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 09a7add..ab916c6 100644 --- a/Android.mk +++ b/Android.mk @@ -697,7 +697,8 @@ LOCAL_DROIDDOC_OPTIONS:= \ $(web_docs_sample_code_flags) \ -devsite \ -toroot / \ - -hdf android.whichdoc online + -hdf android.whichdoc online \ + -hdf devsite true LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ds -- cgit v1.1 From 4b7161cbd44f64537d2c661e87868ea2689dd126 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Tue, 29 Jan 2013 14:20:13 -0800 Subject: docs: switch devsite doc build to use templates-sdk Change-Id: I933cbafa0712de47b4bcf72d2a7c4f99bf18f930 --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index ab916c6..9ab34d6 100644 --- a/Android.mk +++ b/Android.mk @@ -700,7 +700,7 @@ LOCAL_DROIDDOC_OPTIONS:= \ -hdf android.whichdoc online \ -hdf devsite true -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-ds +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk include $(BUILD_DROIDDOC) -- cgit v1.1 From 9cab5c01168ed96e718fa80e9dd05e04c5d3678c Mon Sep 17 00:00:00 2001 From: Dirk Dougherty Date: Tue, 29 Jan 2013 15:00:04 -0800 Subject: Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager. Change-Id: I9cfa53e605f476daf6cf914f256df600e1d77f89 --- Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index ab916c6..cef7c2f 100644 --- a/Android.mk +++ b/Android.mk @@ -442,7 +442,8 @@ sample_dir := development/samples # the list here should match the list of samples included in the sdk samples package # (see development/build/sdk.atree) -web_docs_sample_code_flags := \ +# remove htmlified samples for now -- samples are still available through the SDK +# web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/AccelerometerPlay \ resources/samples/AccelerometerPlay "Accelerometer Play" \ -- cgit v1.1 From 5f9922d7c3bce158e4c7a58929d4075e7c91e32e Mon Sep 17 00:00:00 2001 From: Robert Ly Date: Tue, 4 Dec 2012 17:01:46 -0800 Subject: makefile changes for gcm javadocs Change-Id: I5653eb710f13f0a097cb1cf447469c4da7342fe2 --- Android.mk | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 954d0a9..5d6a2b1 100644 --- a/Android.mk +++ b/Android.mk @@ -708,6 +708,33 @@ include $(BUILD_DROIDDOC) # explicitly specify that ds depends on framework-res and any generated docs $(full_target): framework-res-package-target + +#==== reference docs for GCM ======================= + +include $(CLEAR_VARS) +# +gcm_docs_src_files += \ + $(call all-java-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-client/src) \ + $(call all-java-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-server/src) \ + $(call all-html-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-client/src) \ + $(call all-html-files-under, ../../vendor/unbundled_google/libs/gcm/gcm-server/src) \ + +LOCAL_SRC_FILES := $(gcm_docs_src_files) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE:= online-gcm-ref +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_IS_HOST_MODULE := false + +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := build/tools/droiddoc/templates-sdk + +LOCAL_DROIDDOC_OPTIONS := \ + -toroot / \ + -gcmref \ + -hdf android.whichdoc online \ + -hdf template.showLanguageMenu true + +include $(BUILD_DROIDDOC) + # ==== docs that have all of the stuff that's @hidden ======================= include $(CLEAR_VARS) -- cgit v1.1