Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 750ac4f3 authored by Steve Howard's avatar Steve Howard
Browse files

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
parent 7d735133

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh 
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

core/java.mk

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ ifneq ($(strip $(LOCAL_JARJAR_RULES)),) 
$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(JARJAR)

	@echo JarJar: $@

	$(hide) $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

	$(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

else

$(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(ACP)

	@echo Copying: $@
@@ -206,7 +206,7 @@ $(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(ACP) 
endif



# Keep a copy of the jar just before proguard processing.

$(full_classes_full_names_jar): $(full_classes_emma_jar) | $(ACP)

$(full_classes_full_names_jar): $(full_classes_jarjar_jar) | $(ACP)

	@echo Copying: $@

	$(hide) $(ACP) $< $@