openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor" am: 2fc0f4e484 am: dc8ddb2da5 

am: 6248e3fbaf

Change-Id: Ic2235f14a1191d7bf72914b31368a4a9f3819dc3
This commit is contained in:
Nan Zhang 2017-09-02 19:51:11 +00:00 committed by android-build-merger
parent 8e1c7e1455 6248e3fbaf
commit 1048094109
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/java_library.mk
View File

@ -84,13 +84,13 @@ $(common_javalib.jar): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_D
$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME)
@echo "target Jar: $(PRIVATE_MODULE) ($@)"
ifdef LOCAL_JACK_ENABLED
$(create-empty-package-at,$@.tmp)
$(call create-empty-package-at,$@.tmp)
else
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)
endif
$(call add-dex-to-package-arg,$@.tmp)
ifdef LOCAL_JACK_ENABLED
$(add-carried-jack-resources-to,$@.tmp)
$(call add-carried-jack-resources-to,$@.tmp)
endif
$(hide) $(ZIPTIME) $@.tmp
$(call commit-change-for-toc,$@)