AI 147991: make sources appear in online-pdk/guide
BUG=1815368
Automated import of CL 147991
diff --git a/pdk/Pdk.mk b/pdk/Pdk.mk
index 29a08a3..3e079c5 100644
--- a/pdk/Pdk.mk
+++ b/pdk/Pdk.mk
@@ -53,7 +53,8 @@
pdk_camera_dir := frameworks/base/include/ui
# Destination directory for docs (templates + doxygenated headers)
-pdk_docs_dest_dir := $(pdk_docs_intermediates)/docs
+pdk_docs_dest_dir := $(pdk_docs_intermediates)/docs/guide
+pdk_app_eng_root := $(pdk_docs_intermediates)/docs
# Working directory for source to be doxygenated
pdk_doxy_source_dir := $(pdk_docs_intermediates)/sources
@@ -101,7 +102,7 @@
# copy-one-file defines the actual rule.
$(foreach template,$(pdk_templates), \
$(eval _chFrom := $(template)) \
- $(eval _chTo := $(pdk_docs_dest_dir)/$(patsubst $(pdk_templates_dir)/%,%,$(template))) \
+ $(eval _chTo := $(pdk_app_eng_root)/$(patsubst $(pdk_templates_dir)/%,%,$(template))) \
$(eval $(call copy-one-header,$(_chFrom),$(_chTo))) \
$(eval all_copied_pdk_templates: $(_chTo)) \
)
@@ -160,7 +161,7 @@
@cd $(pdk_generated_source_dir) && chmod ug+rx *
@rm -f $(pdk_generated_source_dir)/index.html
# Fix a doxygen bug: in *-source.html file insert '</div>\n' after line 25
- @$(pdk_hosting_dir)/edoxfix.sh $(pdk_generated_source_dir)
+ # @$(pdk_hosting_dir)/edoxfix.sh $(pdk_generated_source_dir)
@cp -fp $(pdk_generated_source_dir)/* $(pdk_docs_dest_dir)
@rm $(pdk_generated_source_dir)/*
@@ -179,13 +180,13 @@
LOCAL_SRC_FILES := pdk-timestamp samples/samplejni/src/com/example/jniexample/JNIExample.java
LOCAL_MODULE_CLASS := development/pdk/ndk/samples/samplejni/src/com/example/jniexample
LOCAL_DROIDDOC_SOURCE_PATH := $(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
-LOCAL_DROIDDOC_HTML_DIR := ../../../$(pdk_docs_dest_dir)
+LOCAL_DROIDDOC_HTML_DIR := ../../../$(pdk_app_eng_root)
LOCAL_MODULE := online-pdk
-LOCAL_DROIDDOC_OPTIONS := \
- -toroot /online-pdk/ \
- -hdf android.whichdoc online-pdk
+LOCAL_DROIDDOC_OPTIONS:= \
+ -toroot /online-pdk/ \
+ -hdf android.whichdoc online-pdk
LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR := build/tools/droiddoc/templates-pdk
LOCAL_DROIDDOC_CUSTOM_ASSET_DIR := assets-pdk
@@ -231,7 +232,7 @@
@echo "PDK docs: $@"
@mkdir -p $(dir $@)
@rm -f $@
- $(hide) tar rf $@ -C $(OUT_DOCS) $(LOCAL_MODULE) pdk.py app.yaml
+ $(hide) tar rf $@ -C $(OUT_DOCS) $(LOCAL_MODULE) pdk.py app.yaml
# Debugging reporting can go here, add it as a target to get output.
pdk_debug:
diff --git a/pdk/hosting/pdk.py b/pdk/hosting/pdk.py
index 421f195..a1c7c07 100644
--- a/pdk/hosting/pdk.py
+++ b/pdk/hosting/pdk.py
@@ -26,7 +26,7 @@
class MainPage(webapp.RequestHandler):
def get(self):
- self.redirect('online-pdk/index.html')
+ self.redirect('online-pdk/guide/index.html')
application = webapp.WSGIApplication([('/', MainPage)], debug=True)