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

Merge "Add Turbine as part of java build toolchain in Make." am: 0b23748128 am: 2764a16085

Browse Source 
am: 3c30f84e2d

Change-Id: I3e42a07747ffb09b10ab07785d761ddc84574ae0
This commit is contained in:
Nan Zhang
2017-08-31 18:25:44 +00:00
committed by android-build-merger
parent 259b08f555 3c30f84e2d
commit 672898977f
9 changed files with 167 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java_library.mk
View File

@@ -86,13 +86,16 @@ $(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME)
ifdef LOCAL_JACK_ENABLED
$(create-empty-package)
else
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)
endif
$(add-dex-to-package)
$(call add-dex-to-package-arg,$@.tmp)
ifdef LOCAL_JACK_ENABLED
$(add-carried-jack-resources)
endif
$(remove-timestamps-from-package)
$(hide) $(ZIPTIME) $@.tmp
$(call commit-change-for-toc,$@)
.KATI_RESTAT: $(common_javalib.jar)
ifdef LOCAL_DEX_PREOPT
ifneq ($(dexpreopt_boot_jar_module),) # boot jar