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 
am: 51eff801ad

Change-Id: I8d2f4aa6739a908a0591384121686976cb6516c8
This commit is contained in:
Jeff Gaston
2018-03-30 22:02:10 +00:00
committed by android-build-merger
parent 368b0c0c5a 51eff801ad
commit e7479b7c5d
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java.mk
View File

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