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

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

Browse Source 
am: dc8ddb2da5

Change-Id: Iee9aca0d47f5cd80d0c3d872ea6325cca3d66963
This commit is contained in:
Nan Zhang
2017-09-02 19:43:39 +00:00
committed by android-build-merger
parent 4a03375cc7 dc8ddb2da5
commit 6248e3fbaf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java_library.mk
View File

@@ -83,13 +83,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,$@)