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

resolved conflicts for merge of 0f205ad9 to master

Browse Source 
Change-Id: Ic741805a0037d8d29d7d5ff6e2b6e83067943f12
This commit is contained in:
Ying Wang
2015-01-22 11:53:00 -08:00
parent 833b427d72 0f205ad959
commit 4d26681f3d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_dalvik_java_library.mk
View File

@@ -128,7 +128,7 @@ $(full_classes_jack): $(built_dex)
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)
$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)
@echo "Host Jar: $(PRIVATE_MODULE) ($@)"
$(create-empty-package)
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@)
$(add-dex-to-package)
$(add-carried-jack-resources)