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

Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt

Browse source 
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug 12382916.

Bug: 12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
This commit is contained in:
Ying Wang 2014-01-03 16:24:56 -08:00
parent 1ff0836ce0
commit 8157cec3e9
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/dex_preopt_odex_install.mk
View file

@ -8,15 +8,13 @@ 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)
else # LOCAL_APK_LIBRARIES not empty
LOCAL_DEX_PREOPT := nostripping
endif # LOCAL_APK_LIBRARIES not empty
endif # LOCAL_DEX_PREOPT undefined
endif # 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)
else # LOCAL_APK_LIBRARIES not empty
LOCAL_DEX_PREOPT := nostripping
endif # LOCAL_APK_LIBRARIES not empty
endif # LOCAL_DEX_PREOPT undefined
endif # TARGET_BUILD_APPS empty
endif # WITH_DEXPREOPT=true
ifeq (false,$(LOCAL_DEX_PREOPT))

1
target/product/base.mk
View file

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