Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt

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

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index 70b83a4..e0932a9 100644 (file)
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -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))

diff --git a/target/product/base.mk b/target/product/base.mk
index 6725c0d..68babad 100644 (file)
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -31,6 +31,7 @@ PRODUCT_PACKAGES += \
     dhcpcd-run-hooks \
     dnsmasq \
     framework \
+    framework2 \
     fsck_msdos \
     ime \
     javax.obex \