OSDN Git Service

(root) / android-x86 / build.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7d73513) | patch
Manual merge of change 50994 from master (DO NOT MERGE)
authorSteve Howard <showard@google.com>
Mon, 3 May 2010 22:01:38 +0000 (15:01 -0700)
committerSteve Howard <showard@google.com>
Fri, 2 Jul 2010 02:52:04 +0000 (19:52 -0700)
commit750ac4f3a43dfbb66e45517ce2502858daeab1a9
tree852342737c575f8e2fa9e88f26d72030778cabf6tree | snapshot
parent7d735133cd6f019ce839fa824f4507f19aff2e8fcommit | 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
core/config.mk diff | blob | history
core/java.mk diff | blob | history
build
About OSDN
Find Software
Develop Software
Help