am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"

* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
This commit is contained in:
Ying Wang 2014-01-03 17:59:59 -08:00 committed by Android Git Automerger
commit f05eecc368
2 changed files with 8 additions and 9 deletions

View file

@ -8,7 +8,6 @@ ifneq (true,$(WITH_DEXPREOPT))
LOCAL_DEX_PREOPT :=
else # WITH_DEXPREOPT=true
ifeq (,$(TARGET_BUILD_APPS)) # TARGET_BUILD_APPS empty
ifneq (,$(LOCAL_SRC_FILES)) # LOCAL_SRC_FILES not empty
ifndef LOCAL_DEX_PREOPT # LOCAL_DEX_PREOPT undefined
ifeq (,$(LOCAL_APK_LIBRARIES)) # LOCAL_APK_LIBRARIES empty
LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)
@ -16,7 +15,6 @@ else # WITH_DEXPREOPT=true
LOCAL_DEX_PREOPT := nostripping
endif # LOCAL_APK_LIBRARIES not empty
endif # LOCAL_DEX_PREOPT undefined
endif # LOCAL_SRC_FILES not empty
endif # TARGET_BUILD_APPS empty
endif # WITH_DEXPREOPT=true
ifeq (false,$(LOCAL_DEX_PREOPT))

View file

@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \
dhcpcd-run-hooks \
dnsmasq \
framework \
framework2 \
fsck_msdos \
ime \
javax.obex \