Commit Graph

55 Commits

Author SHA1 Message Date
Dan Albert 954b5bdcf4 Make modules depend on their makefile.
This should obviate much of the need for cleanspecs, and also make it
unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this
sort of thing all over the tree.

Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
2014-11-11 14:30:54 -08:00
Ying Wang 14c975b830 Remove framework2
We don't need fraemwork2 split with the multidex framework.jar.

Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
2014-07-21 14:42:29 -07:00
Ying Wang efb935800b Support "LOCAL_SDK_VERSION := system_current"
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
2014-07-19 17:00:50 -07:00
Ying Wang 55ec7e63d0 am 9e00b638: am cd02c025: am 979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
  Fix host java doc by referring to the correct classpath.
2014-07-08 01:38:44 +00:00
Ying Wang ad7809bba4 Fix host java doc by referring to the correct classpath.
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
2014-07-07 16:50:39 -07:00
Brian Carlstrom b1dafb1804 Switch from core to core-libart
Bug: 14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
2014-06-18 17:42:32 -07:00
Brian Carlstrom 55fa2ea206 resolved conflicts for merge of 8fd9944e to master
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
2014-06-18 19:25:30 -07:00
Bill Yi 1e4adfa837 Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD 2014-04-29 11:32:53 -07:00
Ying Wang a376dd8b02 Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
Change-Id: I77ded6ef35cd91625e7988eafe7eed24fb359757
2014-04-16 13:54:00 -07:00
Ying Wang 3bb5d8bca7 Fix html_dir_files in droiddoc.mk
Previously html_dir_files includes every file in $(LOCAL_PATH), if
$(LOCAL_DROIDDOC_HTML_DIR) isn't set.

Change-Id: I3c249e5f4a0f52f71edd92862361c1dc4ab6bed7
2014-04-16 11:28:48 -07:00
Ying Wang c9c3ed2299 am 5d33de08: am bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
* commit '5d33de08196b5c77a58a3e3a045a1b3bf31e09a7':
  Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
2014-04-07 22:48:38 +00:00
Ying Wang 25c0096bd3 am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc."
* commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98':
  Different bootclasspath for droiddoc.
2014-04-07 22:48:37 +00:00
Ying Wang bdac8cf148 Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"" 2014-04-07 22:41:22 +00:00
Ying Wang be835b6f3e am 90219d98: am cb733bc5: Merge "Fix droiddoc generation."
* commit '90219d985fd784be5bcee8ce7b62aa41f41d0dd7':
  Fix droiddoc generation.
2014-04-07 22:36:43 +00:00
Ying Wang 5b6b46459c Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle 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
2014-04-07 15:19:33 -07:00
Ying Wang 584d8adbea Different bootclasspath for droiddoc.
- 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
2014-04-07 15:14:50 -07:00
Narayan Kamath f122d41b75 Fix droiddoc generation.
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
2014-04-07 15:08:18 -07:00
Ying Wang 68abe34c98 am c2f639a1: Merge "Add "-encoding UTF-8" option to javadoc."
* commit 'c2f639a179b3085c7f61a8d71d2ee7b3ff6c9266':
  Add "-encoding UTF-8" option to javadoc.
2013-12-10 11:36:18 -08:00
Ying Wang 34e3e170e4 Add "-encoding UTF-8" option to javadoc.
This fixed docs build on Mac OS X 10.9 with Java 7.
Change-Id: I91e224456c9e6c43dbf13d691c3b37d21f94b0f3
2013-12-10 11:30:01 -08:00
Joe Onorato 36b89ff93f Add a convenient target for building a zip file of javadocs: $(LOCAL_MODULE)-docs.zip
Change-Id: I97fcc0d467f3b7582570b9be7e15acc0a5b550a5
2013-12-04 02:32:06 -08:00
Jeff Brown ae859f9b64 Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
2013-07-17 21:08:18 -07:00
Ying Wang 8578cab066 Fix use of LOCAL_CLASSPATH in droiddoc.mk
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.

Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
2013-06-25 12:34:11 -07:00
Ying Wang b8a256a1fa We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 09:59:17 -08:00
Dirk Dougherty 1151ef4f85 Fix droiddoc builds for second htmldir.
Change-Id: If8e73508babf5e0cb4be271b4aef69317bb6467e
2013-02-05 17:07:12 -08:00
Dirk Dougherty e0f58f9559 am f0b7415e: am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option 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.
2013-02-04 16:43:28 -08:00
Dirk Dougherty 9c2336e073 Add new droiddoc option for project-specific secondary html input/output paths.
Change-Id: Id9c3dc4e7cfcc26c04e4d1aeb6617e3e6b92114b
2013-01-28 19:51:04 -08:00
Ying Wang 4b8459de80 No html_dir_files if no LOCAL_DROIDDOC_HTML_DIR.
This removes unnecessary dependency if there is no
LOCAL_DROIDDOC_HTML_DIR.

Change-Id: If9e06b6e478a9cd61f5441aa376d996857ee2fb5
2013-01-28 19:25:41 -08:00
Ying Wang 13d6950ef8 NOTICE file only module
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
2012-11-01 17:29:10 -07:00
Ying Wang 54fa8c3ff9 Load only the current product config makefile.
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
2012-09-28 15:08:12 -07:00
Ying Wang 157a5e1695 Load only the current product config makefile.
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
2012-09-27 15:17:41 -07:00
Ying Wang 0ec188f1c1 Support to build against prebuilt current SDK in unbundled branch
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
2012-05-10 17:40:49 -07:00
Ying Wang 3f45b3c35c Support to run DroidDoc in unbundled builds.
Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
2012-04-02 18:32:05 -07:00
Jean-Baptiste Queru 1cc1b10f0b am f0d2a546: Merge 78e7f1f0
* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
  Increase the Java heap size for droiddoc
2011-06-07 18:20:30 -07:00
Jean-Baptiste Queru f0d2a54669 Merge 78e7f1f0
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
2011-06-07 13:11:14 -07:00
Ying Wang fb790877a0 Fix use of intermediates in droiddoc
Droiddoc should be product-independent.

Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c
2011-05-17 16:13:47 -07:00
Dominic Binks 86175d2fd5 Increase the Java heap size for droiddoc
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
2011-04-25 13:52:29 -07:00
Joe Onorato 8b566d137d am d68519af: am 9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Merge commit 'd68519af91198164d6f302ea53656649f23cdca9'

* commit 'd68519af91198164d6f302ea53656649f23cdca9':
  Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
2010-09-16 09:43:20 -07:00
Joe Onorato f58df74f6a Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74
2010-09-16 11:57:19 -04:00
Joe Onorato aaa5d11cb3 Make it so if you say LOCAL_UNINSTALLABLE_MODULE := true for a docs build, it won't try to dist it.
Change-Id: Iff8a7b6438d392c5b4c425337b84cfa9bc90f282
2010-09-01 10:39:50 -07:00
Dirk Dougherty d77248ac7e Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.
Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
2010-08-31 10:13:25 -07:00
Bill Napier 9a0e98ac47 Revert "Fix MonkeyRunner SDK documentation generation."
This reverts commit b47386bb27.
2010-08-27 09:58:29 -07:00
Bill Napier b47386bb27 Fix MonkeyRunner SDK documentation generation.
Turns out that find doesn't like being passed paths that don't exist, so
don't do that.

Change-Id: I155cf48625513d1bcbd29329f1949967889dc9cc
2010-08-25 18:16:13 -07:00
Bill Napier 0e143c0ed9 Add support for multiple html directories to droiddoc.
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
2010-08-24 22:16:01 -07:00
Ben Dodson 1034455a24 Migrating to Doclava for documentation generation; 60% speed improvement 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
2010-08-05 15:45:10 -07:00
Ying Wang 572d63052d am 8b4be231: am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
Merge commit '8b4be231519376c9dc73622be4b8a5ddc0d83805'

* commit '8b4be231519376c9dc73622be4b8a5ddc0d83805':
  Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
2010-06-24 11:59:09 -07:00
Ying Wang 8e6f821e73 Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
2010-06-24 11:10:07 -07:00
Ying Wang a52c4f31dc am 48de6ce7: am 7b142da3: Fix javadoc for Java 6.
Merge commit '48de6ce732a797f5c61186a3e57bec535e37d873'

* commit '48de6ce732a797f5c61186a3e57bec535e37d873':
  Fix javadoc for Java 6.
2010-06-23 21:30:04 -07:00
Ying Wang 7b142da3ce Fix javadoc for Java 6.
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
2010-06-23 20:59:22 -07:00
Ying Wang 24de970748 Increase memory for Javadoc.
sdk builds continue breaking for out of memory..

Change-Id: Ie056241309f0303cdd4857cfb1421996811b1a8a
2010-06-18 13:18:05 -07:00
Jesse Wilson 289d80eee4 Adding version information to DroidDoc. Rather than pulling the version from
@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
2009-07-21 18:09:39 -07:00