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

Commit 7acec30a authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files... 

am 3d763e25: am a9a39d6c: am acca12fa: Merge "Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs." into klp-docs

* commit '3d763e25':
  Doc change: move localized files into an intl dir. Build output remains the same for online, offline, and ds docs.
parents 7a7563c0 3d763e25

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ 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)

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /intl/

LOCAL_ADDITIONAL_HTML_DIR:=docs/html-intl /



LOCAL_MODULE := online-sdk
@@ -870,7 +870,7 @@ 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_ADDITIONAL_HTML_DIR:=docs/html-intl/intl /



LOCAL_MODULE := ds