| commit | 750ac4f3a43dfbb66e45517ce2502858daeab1a9 | [log] [tgz] |
|---|---|---|
| author | Steve Howard <showard@google.com> | Mon May 03 15:01:38 2010 -0700 |
| committer | Steve Howard <showard@google.com> | Thu Jul 01 19:52:04 2010 -0700 |
| tree | 852342737c575f8e2fa9e88f26d72030778cabf6 | |
| parent | 7d735133cd6f019ce839fa824f4507f19aff2e8f [diff] |
Manual merge of change 50994 from master (DO NOT MERGE) Merging from master because I'm bringing my maps API work into gingerbread. Fix and enable JarJar in Java builds. java.mk contained a target to enable JarJar in Java builds, but it was being bypassed. This change enabled JarJar as part of the build process, and fixes a slight bug with the way it was set up. Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d