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

Commit e7479b7c authored by Jeff Gaston's avatar Jeff Gaston Committed by android-build-merger
Browse files

Merge "Run jetifier against prebuilts directly rather than classes.jar" into pi-dev 

am: 51eff801

Change-Id: I8d2f4aa6739a908a0591384121686976cb6516c8
parents 368b0c0c 51eff801

core/host_java_library.mk

+1 −7
Original line number Diff line number Diff line
@@ -102,16 +102,10 @@ $(full_classes_combined_jar): $(full_classes_compiled_jar) \ 
	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

            -stripDir META-INF -zipToNotStrip $< $@ $< $(call reverse-list,$(PRIVATE_STATIC_JAVA_LIBRARIES))



#######################################

LOCAL_JETIFIER_INPUT_FILE := $(full_classes_combined_jar)



include $(BUILD_SYSTEM)/jetifier.mk

#######################################



# Run jarjar if necessary, otherwise just copy the file.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_jarjar_jar): $(LOCAL_JETIFIER_OUTPUT_FILE) $(LOCAL_JARJAR_RULES) | $(JARJAR)

$(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	@echo JarJar: $@

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

else

core/java.mk

+1 −7
Original line number Diff line number Diff line
@@ -362,13 +362,7 @@ else 
full_classes_jarjar_jar := $(full_classes_processed_jar)

endif



#######################################

LOCAL_JETIFIER_INPUT_FILE := $(full_classes_jarjar_jar)



include $(BUILD_SYSTEM)/jetifier.mk

#######################################



$(eval $(call copy-one-file,$(LOCAL_JETIFIER_OUTPUT_FILE),$(full_classes_jar)))

$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))



#######################################

LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar)

core/jetifier.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
ifeq ($(strip $(LOCAL_JETIFIER_ENABLED)),true)

  my_jetifier_input_path := $(LOCAL_JETIFIER_INPUT_FILE)

  my_files := $(intermediates.COMMON)/jetifier

  my_jetifier_output_path := $(my_files)/classes-jetifier.jar

  my_jetifier_output_path := $(my_files)/jetified-$(notdir $(my_jetifier_input_path))



$(my_jetifier_output_path) : $(my_jetifier_input_path) $(JETIFIER)

	rm -rf $@

core/prebuilt_internal.mk

+12 −0
Original line number Diff line number Diff line
@@ -571,6 +571,12 @@ else # ! prebuilt_module_is_dex_javalib 
my_src_aar := $(filter %.aar, $(my_prebuilt_src_file))

ifneq ($(my_src_aar),)

# This is .aar file, archive of classes.jar and Android resources.



# run Jetifier if needed

LOCAL_JETIFIER_INPUT_FILE := $(my_src_aar)

include $(BUILD_SYSTEM)/jetifier.mk

my_src_aar := $(LOCAL_JETIFIER_OUTPUT_FILE)



my_src_jar := $(intermediates.COMMON)/aar/classes.jar

my_src_proguard_options := $(intermediates.COMMON)/aar/proguard.txt
@@ -582,6 +588,12 @@ $(my_src_jar) : $(my_src_aar) 
	$(hide) touch $@

	# Make sure the proguard file exists and has a new timestamp.

	$(hide) touch $(dir $@)/proguard.txt

else



# run Jetifier if needed

LOCAL_JETIFIER_INPUT_FILE := $(my_src_jar)

include $(BUILD_SYSTEM)/jetifier.mk

my_src_jar := $(LOCAL_JETIFIER_OUTPUT_FILE)



endif