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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-30 19:11:21 +00:00
committed by Android (Google) Code Review
parent d24396d4df db6557e490
commit 51eff801ad
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/host_java_library.mk
View File

@@ -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) \ $(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \
-stripDir META-INF -zipToNotStrip $< $@ $< $(call reverse-list,$(PRIVATE_STATIC_JAVA_LIBRARIES)) -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. # Run jarjar if necessary, otherwise just copy the file.
ifneq ($(strip $(LOCAL_JARJAR_RULES)),) 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): $(LOCAL_JETIFIER_OUTPUT_FILE) $(LOCAL_JARJAR_RULES) | $(JARJAR) $(full_classes_jarjar_jar): $(full_classes_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)
@echo JarJar: $@ @echo JarJar: $@
$(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@ $(hide) $(JAVA) -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@
else else

8
core/java.mk
View File

@@ -358,13 +358,7 @@ else
full_classes_jarjar_jar := $(full_classes_processed_jar) full_classes_jarjar_jar := $(full_classes_processed_jar)
endif endif
####################################### $(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
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)))
####################################### #######################################
LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar) LOCAL_FULL_CLASSES_PRE_JACOCO_JAR := $(full_classes_jar)

2
core/jetifier.mk
View File

@@ -20,7 +20,7 @@
ifeq ($(strip $(LOCAL_JETIFIER_ENABLED)),true) ifeq ($(strip $(LOCAL_JETIFIER_ENABLED)),true)
my_jetifier_input_path := $(LOCAL_JETIFIER_INPUT_FILE) my_jetifier_input_path := $(LOCAL_JETIFIER_INPUT_FILE)
my_files := $(intermediates.COMMON)/jetifier 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) $(my_jetifier_output_path) : $(my_jetifier_input_path) $(JETIFIER)
rm -rf $@ rm -rf $@

12
core/prebuilt_internal.mk
View File

@@ -571,6 +571,12 @@ else # ! prebuilt_module_is_dex_javalib
my_src_aar := $(filter %.aar, $(my_prebuilt_src_file)) my_src_aar := $(filter %.aar, $(my_prebuilt_src_file))
ifneq ($(my_src_aar),) ifneq ($(my_src_aar),)
# This is .aar file, archive of classes.jar and Android resources. # 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_jar := $(intermediates.COMMON)/aar/classes.jar
my_src_proguard_options := $(intermediates.COMMON)/aar/proguard.txt my_src_proguard_options := $(intermediates.COMMON)/aar/proguard.txt
@@ -582,6 +588,12 @@ $(my_src_jar) : $(my_src_aar)
$(hide) touch $@ $(hide) touch $@
# Make sure the proguard file exists and has a new timestamp. # Make sure the proguard file exists and has a new timestamp.
$(hide) touch $(dir $@)/proguard.txt $(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 endif