tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 5cb94751: am 9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS

Browse source 
Merge commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b'

* commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b':
  Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
This commit is contained in:
Ying Wang 2010-09-27 20:33:29 -07:00 committed by Android Git Automerger
commit b017638629
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/java_library.mk
View file

@ -27,6 +27,9 @@ ifndef LOCAL_IS_HOST_MODULE
ifeq (true,$(WITH_DEXPREOPT))
ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true
jar_with_dex := $(intermediates.COMMON)/javalib.dex.jar
LOCAL_INTERMEDIATE_TARGETS += $(jar_with_dex)
endif
endif
endif
@ -44,7 +47,6 @@ $(LOCAL_BUILT_MODULE): $(full_classes_jar)
else # !LOCAL_IS_STATIC_JAVA_LIBRARY
ifeq ($(LOCAL_DEX_PREOPT),true)
jar_with_dex := $(intermediates.COMMON)/javalib.dex.jar
$(jar_with_dex): PRIVATE_DEX_FILE := $(built_dex)
$(jar_with_dex) : $(built_dex) $(java_resource_sources) | $(AAPT)
@echo "target Jar: $(PRIVATE_MODULE) ($@)"