commit a47d12e38ae38a6fdceb54172490c94408efa0de
author Ying Wang <wangying@google.com> Sat Jan 04 01:54:02 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 04 01:54:03 2014 +0000
tree e9922c945d2a303c71e8a66278f1c3ca28061006
parent 6e8ffe3f1e328ee71354b539e63b34b2342160a8
parent 9db168ca5ce93cbb43f7245f7163f1be2ff06d54

Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"

core/dex_preopt_odex_install.mk

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

target/product/base.mk

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