am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"

* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
This commit is contained in:
Ying Wang
2013-08-02 11:07:44 -07:00
committed by Android Git Automerger

View File

@@ -95,7 +95,7 @@ $(built_dex): $(full_classes_jar) $(DX)
$(transform-classes.jar-to-dex) $(transform-classes.jar-to-dex)
$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex) $(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)
$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources) | $(AAPT) $(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)
@echo "Host Jar: $(PRIVATE_MODULE) ($@)" @echo "Host Jar: $(PRIVATE_MODULE) ($@)"
$(create-empty-package) $(create-empty-package)
$(add-dex-to-package) $(add-dex-to-package)