commit 750ac4f3a43dfbb66e45517ce2502858daeab1a9
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

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 --git a/core/config.mk b/core/config.mk
index 0877ebd..8d2f96c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -210,7 +210,7 @@
 MKTARBALL := build/tools/mktarball.sh
 TUNE2FS := tune2fs
 E2FSCK := e2fsck
-JARJAR := java -jar $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
+JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
 PROGUARD := external/proguard/bin/proguard.sh
 JAVATAGS := build/tools/java-event-log-tags.py