summaryrefslogtreecommitdiffstats
path: root/core/droiddoc.mk
Commit message (Collapse)AuthorAgeFilesLines
* Remove framework2Ying Wang2014-07-211-1/+1
| | | | | | We don't need fraemwork2 split with the multidex framework.jar. Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
* Support "LOCAL_SDK_VERSION := system_current"Ying Wang2014-07-191-0/+3
| | | | | | | | A module can declare "LOCAL_SDK_VERSION := system_current" to build against the android system stubs generated from source. For now this is only supported in platform build. Change-Id: I1e9bbd159886bc0ea3a02b1dc4cbcb1a56e9cb15
* am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring ↵Ying Wang2014-07-081-3/+6
|\ | | | | | | | | | | | | to the correct classpath." * commit '9e00b6385c5805743f5beaa22dffce021342ed5e': Fix host java doc by referring to the correct classpath.
| * Fix host java doc by referring to the correct classpath.Ying Wang2014-07-071-3/+6
| | | | | | | | | | | | | | | | | | | | In droiddoc for host, we don't generate classes.jar for LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead. This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in base_rules.mk. Bug: 9176318 Change-Id: If7460b30ca5da28743487d66da0029a44108d556
* | resolved conflicts for merge of 8fd9944e to masterBrian Carlstrom2014-06-181-2/+2
|\ \ | |/ | | | | Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
| * Switch from core to core-libartBrian Carlstrom2014-06-181-2/+2
| | | | | | | | | | Bug: 14298175 Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
| * Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEADBill Yi2014-04-291-0/+2
| |\
* | | Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.Ying Wang2014-04-161-1/+0
| | | | | | | | | | | | Change-Id: I77ded6ef35cd91625e7988eafe7eed24fb359757
* | | Fix html_dir_files in droiddoc.mkYing Wang2014-04-161-8/+5
| | | | | | | | | | | | | | | | | | | | | Previously html_dir_files includes every file in $(LOCAL_PATH), if $(LOCAL_DROIDDOC_HTML_DIR) isn't set. Change-Id: I3c249e5f4a0f52f71edd92862361c1dc4ab6bed7
* | | am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file for ↵Ying Wang2014-04-071-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | sun.util.resources.OpenListResourceBundle not found"" * commit '5d33de08196b5c77a58a3e3a045a1b3bf31e09a7': Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
| * | Merge "Fix javadoc error "class file for ↵Ying Wang2014-04-071-0/+2
| |\ \ | | | | | | | | | | | | sun.util.resources.OpenListResourceBundle not found""
| | * | Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle ↵Ying Wang2014-04-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not found" It seems to be a javac/javadoc bug. See https://code.google.com/p/doclava/issues/detail?id=38 sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar, but sometimes on some platform javadoc/javac can't find it. -XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym and link against rt.jar directly. Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
* | | | am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc."Ying Wang2014-04-071-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98': Different bootclasspath for droiddoc.
| * | | Different bootclasspath for droiddoc.Ying Wang2014-04-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If it's host module, don't set bootclasspath; - If it's arget module, - It can build against the API stubs; - It can build against a historical SDK version; - It can build against core.jar Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
* | | | am 90219d98: am cb733bc5: Merge "Fix droiddoc generation."Ying Wang2014-04-071-6/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '90219d985fd784be5bcee8ce7b62aa41f41d0dd7': Fix droiddoc generation.
| * | Fix droiddoc generation.Narayan Kamath2014-04-071-6/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | We want javadoc generated from the standard libraries we supply and not the host standard libraries. This also has the side effect of fixing javadoc generation for java7 APIs that android introduced, while compiling with java6. bug: 8992787 Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
* | am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."Ying Wang2013-12-101-0/+2
|\ \ | |/ | | | | | | * commit 'c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266': Add "-encoding UTF-8" option to javadoc.
| * Add "-encoding UTF-8" option to javadoc.Ying Wang2013-12-101-0/+2
| | | | | | | | | | This fixed docs build on Mac OS X 10.9 with Java 7. Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
* | Add a convenient target for building a zip file of javadocs: ↵Joe Onorato2013-12-041-0/+2
|/ | | | | | $(LOCAL_MODULE)-docs.zip Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
* Split framework jar.Jeff Brown2013-07-171-1/+1
| | | | Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
* Fix use of LOCAL_CLASSPATH in droiddoc.mkYing Wang2013-06-251-11/+3
| | | | | | | Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES. You should use LOCAL_JAVA_LIBRARIES in that case. Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
* We shouldn't use temporary variable in the build recipe.Ying Wang2013-02-221-2/+2
| | | | | | Use $@ instead. Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
* Fix droiddoc builds for second htmldir.Dirk Dougherty2013-02-051-3/+8
| | | | Change-Id: If8e73508babf5e0cb4be271b4aef69317bb6467e
* am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option ↵Dirk Dougherty2013-02-041-0/+6
|\ | | | | | | | | | | | | | | for project-specific secondary html input/output paths. # Via Android Git Automerger (3) and Dirk Dougherty (1) * commit 'f0b7415e6e27120b6358445c3c58fef7cc43f28a': Add new droiddoc option for project-specific secondary html input/output paths.
| * Add new droiddoc option for project-specific secondary html input/output paths.Dirk Dougherty2013-01-281-0/+6
| | | | | | | | Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
| * Load only the current product config makefile.Ying Wang2012-09-281-2/+0
| | | | | | | | | | | | | | | | | | | | To reduce the start time. With the change and previous change of doing clean step in only given paths, start time of mm/mmm is reduced from ~5s to about 1s; lunch time is reduced from ~40s to 3.5s. Bug: 7186768,7169854 Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
* | No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR.Ying Wang2013-01-281-3/+3
| | | | | | | | | | | | | | This removes unnecessary dependency if there is no LOCAL_DROIDDOC_HTML_DIR. Change-Id: If9e06b6e478a9cd61f5441aa376d996857ee2fb5
* | NOTICE file only moduleYing Wang2012-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | To pick up a NOTICE file in LOCAL_PATH and attach it to /system/lib/libfoo.so, use the following syntax: include $(CLEAR_VARS) LOCAL_MODULE_CLASS := NOTICE_FILES LOCAL_INSTALLED_MODULE := $(PRODUCT_OUT)/system/lib/libfoo.so include $(BUILD_NOTICE_FILE) Bug: 7460213 Change-Id: Ie692be72deab37be04d1b578578c131a0885a090
* | Load only the current product config makefile.Ying Wang2012-09-271-2/+0
|/ | | | | | | | | | To reduce the start time. With the change and previous change of doing clean step in only given paths, start time of mm/mmm is reduced from ~5s to about 1s; lunch time is reduced from ~40s to 3.5s. Bug: 7186768,7169854 Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
* Support to build against prebuilt current SDK in unbundled branchYing Wang2012-05-101-1/+2
| | | | | | | | Bug: 6465084 With this change and prebuilt current SDK checked in, you can build unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch. Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
* Support to run DroidDoc in unbundled builds.Ying Wang2012-04-021-3/+11
| | | | Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
* am f0d2a546: Merge 78e7f1f0Jean-Baptiste Queru2011-06-071-1/+1
|\ | | | | | | | | * commit 'f0d2a54669c8bf14e95482437e361c81dfb62404': Increase the Java heap size for droiddoc
| * Merge 78e7f1f0Jean-Baptiste Queru2011-06-071-1/+1
| |\ | | | | | | | | | Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
| | * Increase the Java heap size for droiddocDominic Binks2011-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increasing the Java heap for droiddoc generation from 768 to 1280 megabytes reduces build times by about 2-3 minutes. For fast build servers this can reduce build times by around 30%. For slower workstation class machines the build is reduced with no other obvious undesirable side effects. Change-Id: I4ff04318ae78fc7b5a5a0499bacfc5527e966ff6
* | | Fix use of intermediates in droiddocYing Wang2011-05-171-3/+3
|/ / | | | | | | | | | | Droiddoc should be product-independent. Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c
* | am d68519af: am 9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for ↵Joe Onorato2010-09-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | droiddoc modules." into gingerbread Merge commit 'd68519af91198164d6f302ea53656649f23cdca9' * commit 'd68519af91198164d6f302ea53656649f23cdca9': Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
| * Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.Joe Onorato2010-09-161-1/+1
| | | | | | | | Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74
| * Add support for multiple html directories to droiddoc.Bill Napier2010-08-241-1/+1
| | | | | | | | | | | | | | | | The goal for adding this support is to allow droiddoc to pull html files both from the static content and from content generated at build time. Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
* | Make it so if you say LOCAL_UNINSTALLABLE_MODULE := true for a docs build, ↵Joe Onorato2010-09-011-0/+4
| | | | | | | | | | | | it won't try to dist it. Change-Id: Iff8a7b6438d392c5b4c425337b84cfa9bc90f282
* | Remove droiddoc/templates dir in favor of templates-sdk, move ↵Dirk Dougherty2010-08-311-14/+1
| | | | | | | | | | | | Android-specific assets to templates-sdk, add copies to templates-pdk as workaround. Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
* | Revert "Fix MonkeyRunner SDK documentation generation."Bill Napier2010-08-271-2/+2
| | | | | | | | This reverts commit b47386bb270ec8f8f007d4fc9f7823530b74fdac.
* | Fix MonkeyRunner SDK documentation generation.Bill Napier2010-08-251-2/+2
| | | | | | | | | | | | | | Turns out that find doesn't like being passed paths that don't exist, so don't do that. Change-Id: I155cf48625513d1bcbd29329f1949967889dc9cc
* | Migrating to Doclava for documentation generation; 60% speed improvement ↵Ben Dodson2010-08-051-7/+3
| | | | | | | | | | | | when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava Change-Id: If317bd108043b152d28babc88a7c949db5127a93
* | am 8b4be231: am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from ↵Ying Wang2010-06-241-0/+1
|\ \ | |/ | | | | | | | | | | | | | | moduels that depend on api-stubs-timestamp Merge commit '8b4be231519376c9dc73622be4b8a5ddc0d83805' * commit '8b4be231519376c9dc73622be4b8a5ddc0d83805': Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
| * Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on ↵Ying Wang2010-06-241-0/+1
| | | | | | | | | | | | | | | | api-stubs-timestamp The inherited value has caused build breakage on Mac build. Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
* | am 48de6ce7: am 7b142da3: Fix javadoc for Java 6.Ying Wang2010-06-231-0/+7
|\ \ | |/ | | | | | | | | | | Merge commit '48de6ce732a797f5c61186a3e57bec535e37d873' * commit '48de6ce732a797f5c61186a3e57bec535e37d873': Fix javadoc for Java 6.
| * Fix javadoc for Java 6.Ying Wang2010-06-231-0/+7
| | | | | | | | | | | | | | If you don't set bootclasspath, there would be errors like: javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
* | Increase memory for Javadoc.Ying Wang2010-06-181-2/+2
|/ | | | | | sdk builds continue breaking for out of memory.. Change-Id: Ie056241309f0303cdd4857cfb1421996811b1a8a
* Adding version information to DroidDoc. Rather than pulling the version fromJesse Wilson2009-07-211-1/+1
| | | | | | | | | | | | | | @since tags in the code, it's pulled from the API XML files also used by apicheck. The code now reads the apicheck XML, and applies it's versions to the DroidDoc class models. The models output the version to HDF, and that's picked up by the CS templates. The clearsilver templates will be changed to be pretty in a follow up change. Conflicts: tools/droiddoc/src/DroidDoc.java
* AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the ↵Joe Onorato2009-04-091-1/+0
| | | | | | | | | | build because the commandline is too long Original author: joeo Merged from: //branches/cupcake/... Automated import of CL 145621
generated by cgit v1.1 at 2025-01-12 10:55:33 +0000