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

Commit bbab0a2c authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Fix typo." am: deeb2d24

am: f0522b0c

* commit 'f0522b0c':
  Fix typo.
parents b06b09a0 f0522b0c
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -1916,7 +1916,7 @@ define transform-jar-to-jack
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $<
	$(JILL) $(PRIVATE_JILL_FLAGS) --output $@.tmpjill.jack $<
	$(hide) mkdir -p $@.tmpjill.res
	$(hide) mkdir -p $@.tmpjill.res
	$(hide) unzip -qo $< -d @.tmpjill.res
	$(hide) unzip -qo $< -d $@.tmpjill.res
	$(hide) find $@.tmpjill.res -iname "*.class" -delete
	$(hide) find $@.tmpjill.res -iname "*.class" -delete
	$(hide) $(call call-jack) \
	$(hide) $(call call-jack) \
        -D jack.import.resource.policy=keep-first \
        -D jack.import.resource.policy=keep-first \