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

Commit d5d60955 authored by Steve Howard's avatar Steve Howard Committed by Android Git Automerger
Browse files

am 750ac4f3: Manual merge of change 50994 from master (DO NOT MERGE) 

Merge commit '750ac4f3' into gingerbread-plus-aosp

* commit '750ac4f3':
  Manual merge of change 50994 from master (DO NOT MERGE)
parents 6069db77 750ac4f3

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) $< $@