Fix up the makefiles and some samples.
Add LOCAL_DEX_PREOPT := false to force the samples to build actual apks.
In addition, fix a couple of other small issues:
- TtsEngine didn't have the api level set properly.
- SimpleJNI used a non-ndk library and was using libc++.
Change-Id: I1fd7c187956eed4620049bb746f4d62babcd648a
diff --git a/samples/AccelerometerPlay/Android.mk b/samples/AccelerometerPlay/Android.mk
index e4b0ab9..8558f09 100644
--- a/samples/AccelerometerPlay/Android.mk
+++ b/samples/AccelerometerPlay/Android.mk
@@ -27,6 +27,8 @@
LOCAL_AAPT_FLAGS = -c 120dpi -c 240dpi -c 160dpi
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/AliasActivity/Android.mk b/samples/AliasActivity/Android.mk
index a34e1bf..9244659 100644
--- a/samples/AliasActivity/Android.mk
+++ b/samples/AliasActivity/Android.mk
@@ -9,4 +9,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/AndroidBeamDemo/Android.mk b/samples/AndroidBeamDemo/Android.mk
index b5f45e8..0b76279 100644
--- a/samples/AndroidBeamDemo/Android.mk
+++ b/samples/AndroidBeamDemo/Android.mk
@@ -10,4 +10,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index 66100b1..fedf65a 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -18,6 +18,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the folloing include to make our test apk.
diff --git a/samples/AppNavigation/Android.mk b/samples/AppNavigation/Android.mk
index cdc0717..c7dde81 100644
--- a/samples/AppNavigation/Android.mk
+++ b/samples/AppNavigation/Android.mk
@@ -9,6 +9,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/samples/BackupRestore/Android.mk b/samples/BackupRestore/Android.mk
index abe2526..d5f636c 100644
--- a/samples/BackupRestore/Android.mk
+++ b/samples/BackupRestore/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/samples/BasicGLSurfaceView/Android.mk b/samples/BasicGLSurfaceView/Android.mk
index 1898bb7..0400ac6 100644
--- a/samples/BasicGLSurfaceView/Android.mk
+++ b/samples/BasicGLSurfaceView/Android.mk
@@ -10,4 +10,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/BluetoothChat/Android.mk b/samples/BluetoothChat/Android.mk
index f1b3a27..a959878 100644
--- a/samples/BluetoothChat/Android.mk
+++ b/samples/BluetoothChat/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/BluetoothHDP/Android.mk b/samples/BluetoothHDP/Android.mk
index 2fb0a11..3c7c49f 100644
--- a/samples/BluetoothHDP/Android.mk
+++ b/samples/BluetoothHDP/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/BusinessCard/Android.mk b/samples/BusinessCard/Android.mk
index 627cac1..78eba5f 100644
--- a/samples/BusinessCard/Android.mk
+++ b/samples/BusinessCard/Android.mk
@@ -10,4 +10,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/Compass/Android.mk b/samples/Compass/Android.mk
index 9434582..8f0050f 100644
--- a/samples/Compass/Android.mk
+++ b/samples/Compass/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/ContactManager/Android.mk b/samples/ContactManager/Android.mk
index c585716..d8e2856 100644
--- a/samples/ContactManager/Android.mk
+++ b/samples/ContactManager/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/CubeLiveWallpaper/Android.mk b/samples/CubeLiveWallpaper/Android.mk
index f14c5e6..d2bb154 100644
--- a/samples/CubeLiveWallpaper/Android.mk
+++ b/samples/CubeLiveWallpaper/Android.mk
@@ -25,4 +25,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/FixedGridLayout/Android.mk b/samples/FixedGridLayout/Android.mk
index 1562cb9..4b046c1 100644
--- a/samples/FixedGridLayout/Android.mk
+++ b/samples/FixedGridLayout/Android.mk
@@ -9,4 +9,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/HeavyWeight/Android.mk b/samples/HeavyWeight/Android.mk
index d791ae5..8eca2c5 100644
--- a/samples/HeavyWeight/Android.mk
+++ b/samples/HeavyWeight/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
# Currently doesn't build
#include $(BUILD_PACKAGE)
diff --git a/samples/HelloActivity/Android.mk b/samples/HelloActivity/Android.mk
index 7f54bdb..caa86d1 100644
--- a/samples/HelloActivity/Android.mk
+++ b/samples/HelloActivity/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/HelloEffects/Android.mk b/samples/HelloEffects/Android.mk
index 1d9a50a..a3aa38a 100644
--- a/samples/HelloEffects/Android.mk
+++ b/samples/HelloEffects/Android.mk
@@ -9,4 +9,6 @@
LOCAL_PACKAGE_NAME := HelloEffects
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/Home/Android.mk b/samples/Home/Android.mk
index ddc1851..748e8c2 100644
--- a/samples/Home/Android.mk
+++ b/samples/Home/Android.mk
@@ -9,4 +9,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/HoneycombGallery/Android.mk b/samples/HoneycombGallery/Android.mk
index e56ae15..1a9f0f5 100644
--- a/samples/HoneycombGallery/Android.mk
+++ b/samples/HoneycombGallery/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/JetBoy/Android.mk b/samples/JetBoy/Android.mk
index 9adb663..8c885ca 100755
--- a/samples/JetBoy/Android.mk
+++ b/samples/JetBoy/Android.mk
@@ -9,4 +9,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/KeyChainDemo/Android.mk b/samples/KeyChainDemo/Android.mk
index a607e95..47495f7 100644
--- a/samples/KeyChainDemo/Android.mk
+++ b/samples/KeyChainDemo/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/LunarLander/Android.mk b/samples/LunarLander/Android.mk
index 8aa11c8..9fd0f4d 100644
--- a/samples/LunarLander/Android.mk
+++ b/samples/LunarLander/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/MultiResolution/Android.mk b/samples/MultiResolution/Android.mk
index 4a5a038..58e75ae 100644
--- a/samples/MultiResolution/Android.mk
+++ b/samples/MultiResolution/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/MySampleRss/Android.mk b/samples/MySampleRss/Android.mk
index fea9729..93d6e72 100644
--- a/samples/MySampleRss/Android.mk
+++ b/samples/MySampleRss/Android.mk
@@ -9,4 +9,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
##include $(BUILD_PACKAGE)
diff --git a/samples/NotePad/Android.mk b/samples/NotePad/Android.mk
index 7939212..bf8db91 100644
--- a/samples/NotePad/Android.mk
+++ b/samples/NotePad/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/Obb/Android.mk b/samples/Obb/Android.mk
index 3418d76..c61613f 100644
--- a/samples/Obb/Android.mk
+++ b/samples/Obb/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/RSSReader/Android.mk b/samples/RSSReader/Android.mk
index 6f95cb4..78232c7 100644
--- a/samples/RSSReader/Android.mk
+++ b/samples/RSSReader/Android.mk
@@ -9,4 +9,6 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/RandomMusicPlayer/Android.mk b/samples/RandomMusicPlayer/Android.mk
index 91637b1..9990d7c 100644
--- a/samples/RandomMusicPlayer/Android.mk
+++ b/samples/RandomMusicPlayer/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/ReceiveShareDemo/Android.mk b/samples/ReceiveShareDemo/Android.mk
index ad62f63..84759ab 100644
--- a/samples/ReceiveShareDemo/Android.mk
+++ b/samples/ReceiveShareDemo/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/SampleSyncAdapter/Android.mk b/samples/SampleSyncAdapter/Android.mk
index 3861a95..07ee0a7 100644
--- a/samples/SampleSyncAdapter/Android.mk
+++ b/samples/SampleSyncAdapter/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := 15
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the folloing include to make our test apk.
diff --git a/samples/SearchableDictionary/Android.mk b/samples/SearchableDictionary/Android.mk
index 8c5fdf4..a18d23c 100755
--- a/samples/SearchableDictionary/Android.mk
+++ b/samples/SearchableDictionary/Android.mk
@@ -9,4 +9,6 @@
LOCAL_PACKAGE_NAME := SearchableDictionary
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/SimpleJNI/Android.mk b/samples/SimpleJNI/Android.mk
index a9600ef..c69dd3a 100644
--- a/samples/SimpleJNI/Android.mk
+++ b/samples/SimpleJNI/Android.mk
@@ -36,6 +36,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# ============================================================
diff --git a/samples/SimpleJNI/jni/Android.mk b/samples/SimpleJNI/jni/Android.mk
index 538c6a0..ff0a684 100644
--- a/samples/SimpleJNI/jni/Android.mk
+++ b/samples/SimpleJNI/jni/Android.mk
@@ -28,20 +28,22 @@
# All of the source files that we will compile.
LOCAL_SRC_FILES:= \
- native.cpp
+ native.cpp
# All of the shared libraries we link against.
LOCAL_SHARED_LIBRARIES := \
- libutils liblog
+ liblog
# No static libraries.
LOCAL_STATIC_LIBRARIES :=
# Also need the JNI headers.
LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE)
+ $(JNI_H_INCLUDE)
# No special compiler flags.
LOCAL_CFLAGS +=
+LOCAL_CXX_STL := none
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/samples/SipDemo/Android.mk b/samples/SipDemo/Android.mk
index 6363727..515b1af 100644
--- a/samples/SipDemo/Android.mk
+++ b/samples/SipDemo/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/SkeletonApp/Android.mk b/samples/SkeletonApp/Android.mk
index 5bada02..fd4fbd7 100644
--- a/samples/SkeletonApp/Android.mk
+++ b/samples/SkeletonApp/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/Snake/Android.mk b/samples/Snake/Android.mk
index 56b642e..33c7931 100644
--- a/samples/Snake/Android.mk
+++ b/samples/Snake/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/SoftKeyboard/Android.mk b/samples/SoftKeyboard/Android.mk
index 883bf2f..f727dcf 100755
--- a/samples/SoftKeyboard/Android.mk
+++ b/samples/SoftKeyboard/Android.mk
@@ -9,4 +9,6 @@
LOCAL_PACKAGE_NAME := SoftKeyboard
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/StackWidget/Android.mk b/samples/StackWidget/Android.mk
index 016a454..5a8ef65 100644
--- a/samples/StackWidget/Android.mk
+++ b/samples/StackWidget/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/Support13Demos/Android.mk b/samples/Support13Demos/Android.mk
index a622f96..100826f 100644
--- a/samples/Support13Demos/Android.mk
+++ b/samples/Support13Demos/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the folloing include to make our test apk.
diff --git a/samples/Support4Demos/Android.mk b/samples/Support4Demos/Android.mk
index 1a760ad..afca76e 100644
--- a/samples/Support4Demos/Android.mk
+++ b/samples/Support4Demos/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/Support7Demos/Android.mk b/samples/Support7Demos/Android.mk
index 371c737..469f762 100644
--- a/samples/Support7Demos/Android.mk
+++ b/samples/Support7Demos/Android.mk
@@ -21,6 +21,7 @@
LOCAL_PACKAGE_NAME := Support7Demos
LOCAL_MODULE_TAGS := samples tests
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
diff --git a/samples/SupportAppNavigation/Android.mk b/samples/SupportAppNavigation/Android.mk
index 6a30e1f..b832911 100644
--- a/samples/SupportAppNavigation/Android.mk
+++ b/samples/SupportAppNavigation/Android.mk
@@ -11,6 +11,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/samples/SupportDesignDemos/Android.mk b/samples/SupportDesignDemos/Android.mk
index 96068ee..0dc12d4 100644
--- a/samples/SupportDesignDemos/Android.mk
+++ b/samples/SupportDesignDemos/Android.mk
@@ -21,6 +21,7 @@
LOCAL_PACKAGE_NAME := SupportDesignDemos
LOCAL_MODULE_TAGS := samples
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
diff --git a/samples/SupportLeanbackDemos/Android.mk b/samples/SupportLeanbackDemos/Android.mk
index 55bbe44..c62c92c 100644
--- a/samples/SupportLeanbackDemos/Android.mk
+++ b/samples/SupportLeanbackDemos/Android.mk
@@ -21,6 +21,7 @@
LOCAL_PACKAGE_NAME := SupportLeanbackDemos
LOCAL_MODULE_TAGS := samples tests
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
diff --git a/samples/SupportPercentDemos/Android.mk b/samples/SupportPercentDemos/Android.mk
index 6395a84..04ec0be 100644
--- a/samples/SupportPercentDemos/Android.mk
+++ b/samples/SupportPercentDemos/Android.mk
@@ -21,6 +21,7 @@
LOCAL_PACKAGE_NAME := SupportPercentDemos
LOCAL_MODULE_TAGS := samples
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-percent \
diff --git a/samples/ToyVpn/Android.mk b/samples/ToyVpn/Android.mk
index 8fe714c..f84702e 100644
--- a/samples/ToyVpn/Android.mk
+++ b/samples/ToyVpn/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/TtsEngine/Android.mk b/samples/TtsEngine/Android.mk
index a400ef1..74a5614 100644
--- a/samples/TtsEngine/Android.mk
+++ b/samples/TtsEngine/Android.mk
@@ -9,5 +9,7 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/TtsEngine/AndroidManifest.xml b/samples/TtsEngine/AndroidManifest.xml
index 268ac43..93f9697 100644
--- a/samples/TtsEngine/AndroidManifest.xml
+++ b/samples/TtsEngine/AndroidManifest.xml
@@ -17,9 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.ttsengine">
- <!-- TODO: Fix this when the API level for ICS is finalized. -->
- <uses-sdk android:minSdkVersion="IceCreamSandwich"
- android:targetSdkVersion="IceCreamSandwich" />
+ <uses-sdk android:minSdkVersion="14"
+ android:targetSdkVersion="14" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/samples/Vault/Android.mk b/samples/Vault/Android.mk
index b4de298..56957ee 100644
--- a/samples/Vault/Android.mk
+++ b/samples/Vault/Android.mk
@@ -12,4 +12,6 @@
LOCAL_PACKAGE_NAME := Vault
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
diff --git a/samples/VoiceRecognitionService/Android.mk b/samples/VoiceRecognitionService/Android.mk
index 6155a0f..0873b3a 100755
--- a/samples/VoiceRecognitionService/Android.mk
+++ b/samples/VoiceRecognitionService/Android.mk
@@ -7,6 +7,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
LOCAL_PACKAGE_NAME := VoiceRecognitionService
include $(BUILD_PACKAGE)
diff --git a/samples/VoicemailProviderDemo/Android.mk b/samples/VoicemailProviderDemo/Android.mk
index 60bf14d..d4ebb4e 100644
--- a/samples/VoicemailProviderDemo/Android.mk
+++ b/samples/VoicemailProviderDemo/Android.mk
@@ -26,6 +26,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/WeatherListWidget/Android.mk b/samples/WeatherListWidget/Android.mk
index 95d233f..ab02116 100644
--- a/samples/WeatherListWidget/Android.mk
+++ b/samples/WeatherListWidget/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/WiFiDirectDemo/Android.mk b/samples/WiFiDirectDemo/Android.mk
index f77bb85..36c5d45 100644
--- a/samples/WiFiDirectDemo/Android.mk
+++ b/samples/WiFiDirectDemo/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/WiFiDirectServiceDiscovery/Android.mk b/samples/WiFiDirectServiceDiscovery/Android.mk
index 1682aa2..d675ad5 100644
--- a/samples/WiFiDirectServiceDiscovery/Android.mk
+++ b/samples/WiFiDirectServiceDiscovery/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := current
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/Wiktionary/Android.mk b/samples/Wiktionary/Android.mk
index 0d015fd..08f57ff 100644
--- a/samples/Wiktionary/Android.mk
+++ b/samples/Wiktionary/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := 8
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/WiktionarySimple/Android.mk b/samples/WiktionarySimple/Android.mk
index 670cd82..59dc332 100644
--- a/samples/WiktionarySimple/Android.mk
+++ b/samples/WiktionarySimple/Android.mk
@@ -10,6 +10,8 @@
LOCAL_SDK_VERSION := 8
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
diff --git a/samples/XmlAdapters/Android.mk b/samples/XmlAdapters/Android.mk
index 6c46e19..ebf90b2 100644
--- a/samples/XmlAdapters/Android.mk
+++ b/samples/XmlAdapters/Android.mk
@@ -12,6 +12,8 @@
LOCAL_SDK_VERSION := 8
+LOCAL_DEX_PREOPT := false
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
