StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and enable JarJar in Java builds.

Browse Source 
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: If24113f399a168939a1a1d0738c5df57caf8d05f
This commit is contained in:
Steve Howard
2010-05-03 15:01:38 -07:00
parent 0e27dff167
commit ef5c640fd4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -210,7 +210,7 @@ MKEXT2BOOTIMG := external/genext2fs/mkbootimg_ext2.sh
MKTARBALL := build/tools/mktarball.sh MKTARBALL := build/tools/mktarball.sh
TUNE2FS := tune2fs TUNE2FS := tune2fs
E2FSCK := e2fsck E2FSCK := e2fsck
JARJAR := java -jar $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar
PROGUARD := external/proguard/bin/proguard.sh PROGUARD := external/proguard/bin/proguard.sh
JAVATAGS := build/tools/java-event-log-tags.py JAVATAGS := build/tools/java-event-log-tags.py

4
core/java.mk
View File

@@ -197,7 +197,7 @@ ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) $(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
$(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(JARJAR) $(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(JARJAR)
@echo JarJar: $@ @echo JarJar: $@
$(hide) $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@ $(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@
else else
$(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(ACP) $(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(ACP)
@echo Copying: $@ @echo Copying: $@
@@ -205,7 +205,7 @@ $(full_classes_jarjar_jar): $(full_classes_emma_jar) | $(ACP)
endif endif
# Keep a copy of the jar just before proguard processing. # 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: $@ @echo Copying: $@
$(hide) $(ACP) $< $@ $(hide) $(ACP) $< $@