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

57 files changed, 113 insertions, 6 deletions

diff --git a/samples/AccelerometerPlay/Android.mk b/samples/AccelerometerPlay/Android.mk
index e4b0ab98c..8558f09fe 100644
--- a/samples/AccelerometerPlay/Android.mk
+++ b/samples/AccelerometerPlay/Android.mk
@@ -27,6 +27,8 @@ LOCAL_SDK_VERSION := current
 
 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 a34e1bf7f..9244659ab 100644
--- a/samples/AliasActivity/Android.mk
+++ b/samples/AliasActivity/Android.mk
@@ -9,4 +9,6 @@ LOCAL_PACKAGE_NAME := AliasActivity
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/AndroidBeamDemo/Android.mk b/samples/AndroidBeamDemo/Android.mk
index b5f45e864..0b762798f 100644
--- a/samples/AndroidBeamDemo/Android.mk
+++ b/samples/AndroidBeamDemo/Android.mk
@@ -10,4 +10,6 @@ LOCAL_PACKAGE_NAME := AndroidBeamDemo
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index 66100b168..fedf65a10 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -18,6 +18,8 @@ LOCAL_PACKAGE_NAME := ApiDemos
 
 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 cdc0717eb..c7dde81c5 100644
--- a/samples/AppNavigation/Android.mk
+++ b/samples/AppNavigation/Android.mk
@@ -9,6 +9,8 @@ LOCAL_PACKAGE_NAME := AppNavigation
 
 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 abe2526be..d5f636c1b 100644
--- a/samples/BackupRestore/Android.mk
+++ b/samples/BackupRestore/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := BackupRestore
 
 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 1898bb7ed..0400ac65c 100644
--- a/samples/BasicGLSurfaceView/Android.mk
+++ b/samples/BasicGLSurfaceView/Android.mk
@@ -10,4 +10,6 @@ LOCAL_PACKAGE_NAME := BasicGLSurfaceView
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/BluetoothChat/Android.mk b/samples/BluetoothChat/Android.mk
index f1b3a2714..a959878cb 100644
--- a/samples/BluetoothChat/Android.mk
+++ b/samples/BluetoothChat/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := BluetoothChat
 
 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 2fb0a1102..3c7c49f4a 100644
--- a/samples/BluetoothHDP/Android.mk
+++ b/samples/BluetoothHDP/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := BluetoothHDP
 
 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 627cac1d5..78eba5fa1 100644
--- a/samples/BusinessCard/Android.mk
+++ b/samples/BusinessCard/Android.mk
@@ -10,4 +10,6 @@ LOCAL_PACKAGE_NAME := BusinessCard
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/Compass/Android.mk b/samples/Compass/Android.mk
index 943458252..8f0050f7c 100644
--- a/samples/Compass/Android.mk
+++ b/samples/Compass/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := Compass
 
 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 c58571685..d8e28561c 100644
--- a/samples/ContactManager/Android.mk
+++ b/samples/ContactManager/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := ContactManager
 
 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 f14c5e656..d2bb1540b 100644
--- a/samples/CubeLiveWallpaper/Android.mk
+++ b/samples/CubeLiveWallpaper/Android.mk
@@ -25,4 +25,6 @@ LOCAL_PACKAGE_NAME := CubeLiveWallpapers
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/FixedGridLayout/Android.mk b/samples/FixedGridLayout/Android.mk
index 1562cb95c..4b046c190 100644
--- a/samples/FixedGridLayout/Android.mk
+++ b/samples/FixedGridLayout/Android.mk
@@ -9,4 +9,6 @@ LOCAL_PACKAGE_NAME := FixedGridLayout
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/HeavyWeight/Android.mk b/samples/HeavyWeight/Android.mk
index d791ae5b1..8eca2c530 100644
--- a/samples/HeavyWeight/Android.mk
+++ b/samples/HeavyWeight/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := HeavyWeight
 
 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 7f54bdb7e..caa86d158 100644
--- a/samples/HelloActivity/Android.mk
+++ b/samples/HelloActivity/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := HelloActivity
 
 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 1d9a50a54..a3aa38a2f 100644
--- a/samples/HelloEffects/Android.mk
+++ b/samples/HelloEffects/Android.mk
@@ -9,4 +9,6 @@ LOCAL_SDK_VERSION := current
 
 LOCAL_PACKAGE_NAME := HelloEffects
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/Home/Android.mk b/samples/Home/Android.mk
index ddc1851b6..748e8c2fd 100644
--- a/samples/Home/Android.mk
+++ b/samples/Home/Android.mk
@@ -9,4 +9,6 @@ LOCAL_PACKAGE_NAME := Home
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/HoneycombGallery/Android.mk b/samples/HoneycombGallery/Android.mk
index e56ae1575..1a9f0f522 100644
--- a/samples/HoneycombGallery/Android.mk
+++ b/samples/HoneycombGallery/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := HoneycombGallery
 
 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 9adb663fc..8c885caf1 100755
--- a/samples/JetBoy/Android.mk
+++ b/samples/JetBoy/Android.mk
@@ -9,4 +9,6 @@ LOCAL_PACKAGE_NAME := JETBoy
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/KeyChainDemo/Android.mk b/samples/KeyChainDemo/Android.mk
index a607e95d0..47495f714 100644
--- a/samples/KeyChainDemo/Android.mk
+++ b/samples/KeyChainDemo/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := KeyChainDemo
 
 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 8aa11c89d..9fd0f4d44 100644
--- a/samples/LunarLander/Android.mk
+++ b/samples/LunarLander/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := LunarLander
 
 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 4a5a038a3..58e75ae6c 100644
--- a/samples/MultiResolution/Android.mk
+++ b/samples/MultiResolution/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := MultiResolution
 
 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 fea9729a2..93d6e7277 100644
--- a/samples/MySampleRss/Android.mk
+++ b/samples/MySampleRss/Android.mk
@@ -9,4 +9,6 @@ LOCAL_PACKAGE_NAME := MyRSSReader
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 ##include $(BUILD_PACKAGE)
diff --git a/samples/NotePad/Android.mk b/samples/NotePad/Android.mk
index 793921270..bf8db91d4 100644
--- a/samples/NotePad/Android.mk
+++ b/samples/NotePad/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := NotePad
 
 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 3418d76a2..c61613fbe 100644
--- a/samples/Obb/Android.mk
+++ b/samples/Obb/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := ObbApp
 
 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 6f95cb4cf..78232c793 100644
--- a/samples/RSSReader/Android.mk
+++ b/samples/RSSReader/Android.mk
@@ -9,4 +9,6 @@ LOCAL_PACKAGE_NAME := RSSReader
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/RandomMusicPlayer/Android.mk b/samples/RandomMusicPlayer/Android.mk
index 91637b17b..9990d7c3b 100644
--- a/samples/RandomMusicPlayer/Android.mk
+++ b/samples/RandomMusicPlayer/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := RandomMusicPlayer
 
 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 ad62f6367..84759ab70 100644
--- a/samples/ReceiveShareDemo/Android.mk
+++ b/samples/ReceiveShareDemo/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := ReceiveShareDemo
 
 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 3861a955b..07ee0a7c0 100644
--- a/samples/SampleSyncAdapter/Android.mk
+++ b/samples/SampleSyncAdapter/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := SampleSyncAdapter
 
 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 8c5fdf489..a18d23c15 100755
--- a/samples/SearchableDictionary/Android.mk
+++ b/samples/SearchableDictionary/Android.mk
@@ -9,4 +9,6 @@ LOCAL_SDK_VERSION := current
 
 LOCAL_PACKAGE_NAME := SearchableDictionary
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/SimpleJNI/Android.mk b/samples/SimpleJNI/Android.mk
index a9600ef62..c69dd3a2d 100644
--- a/samples/SimpleJNI/Android.mk
+++ b/samples/SimpleJNI/Android.mk
@@ -36,6 +36,8 @@ LOCAL_PROGUARD_ENABLED := disabled
 
 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 538c6a05f..ff0a6842d 100644
--- a/samples/SimpleJNI/jni/Android.mk
+++ b/samples/SimpleJNI/jni/Android.mk
@@ -28,20 +28,22 @@ LOCAL_MODULE:= libsimplejni
 
 # 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 6363727ce..515b1afca 100644
--- a/samples/SipDemo/Android.mk
+++ b/samples/SipDemo/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := SipDemo
 
 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 5bada0297..fd4fbd7a0 100644
--- a/samples/SkeletonApp/Android.mk
+++ b/samples/SkeletonApp/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := SkeletonApp
 
 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 56b642e1e..33c7931f8 100644
--- a/samples/Snake/Android.mk
+++ b/samples/Snake/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := Snake
 
 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 883bf2fd7..f727dcf21 100755
--- a/samples/SoftKeyboard/Android.mk
+++ b/samples/SoftKeyboard/Android.mk
@@ -9,4 +9,6 @@ LOCAL_SDK_VERSION := current
 
 LOCAL_PACKAGE_NAME := SoftKeyboard
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/StackWidget/Android.mk b/samples/StackWidget/Android.mk
index 016a454ea..5a8ef6535 100644
--- a/samples/StackWidget/Android.mk
+++ b/samples/StackWidget/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := StackWidget
 
 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 a622f9695..100826f32 100644
--- a/samples/Support13Demos/Android.mk
+++ b/samples/Support13Demos/Android.mk
@@ -12,6 +12,8 @@ LOCAL_PACKAGE_NAME := Support13Demos
 
 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 1a760ad54..afca76e4e 100644
--- a/samples/Support4Demos/Android.mk
+++ b/samples/Support4Demos/Android.mk
@@ -12,6 +12,8 @@ LOCAL_PACKAGE_NAME := Support4Demos
 
 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 371c737a1..469f7621e 100644
--- a/samples/Support7Demos/Android.mk
+++ b/samples/Support7Demos/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 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 6a30e1f9f..b83291174 100644
--- a/samples/SupportAppNavigation/Android.mk
+++ b/samples/SupportAppNavigation/Android.mk
@@ -11,6 +11,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
 
 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 96068ee6f..0dc12d40d 100644
--- a/samples/SupportDesignDemos/Android.mk
+++ b/samples/SupportDesignDemos/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 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 55bbe4482..c62c92c07 100644
--- a/samples/SupportLeanbackDemos/Android.mk
+++ b/samples/SupportLeanbackDemos/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 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 6395a84b2..04ec0beb7 100644
--- a/samples/SupportPercentDemos/Android.mk
+++ b/samples/SupportPercentDemos/Android.mk
@@ -21,6 +21,7 @@ include $(CLEAR_VARS)
 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 8fe714cae..f84702ec5 100644
--- a/samples/ToyVpn/Android.mk
+++ b/samples/ToyVpn/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := ToyVpn
 
 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 a400ef174..74a56144e 100644
--- a/samples/TtsEngine/Android.mk
+++ b/samples/TtsEngine/Android.mk
@@ -9,5 +9,7 @@ LOCAL_PACKAGE_NAME := TtsEngine
 
 LOCAL_SDK_VERSION := current
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
 
diff --git a/samples/TtsEngine/AndroidManifest.xml b/samples/TtsEngine/AndroidManifest.xml
index 268ac4374..93f96970d 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 b4de2984b..56957ee60 100644
--- a/samples/Vault/Android.mk
+++ b/samples/Vault/Android.mk
@@ -12,4 +12,6 @@ LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_PACKAGE_NAME := Vault
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
diff --git a/samples/VoiceRecognitionService/Android.mk b/samples/VoiceRecognitionService/Android.mk
index 6155a0f49..0873b3a3a 100755
--- a/samples/VoiceRecognitionService/Android.mk
+++ b/samples/VoiceRecognitionService/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 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 60bf14d75..d4ebb4ea1 100644
--- a/samples/VoicemailProviderDemo/Android.mk
+++ b/samples/VoicemailProviderDemo/Android.mk
@@ -26,6 +26,8 @@ LOCAL_PACKAGE_NAME := VoicemailProviderDemo
 
 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 95d233fa8..ab02116c6 100644
--- a/samples/WeatherListWidget/Android.mk
+++ b/samples/WeatherListWidget/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := WeatherListWidget
 
 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 f77bb85d0..36c5d458f 100644
--- a/samples/WiFiDirectDemo/Android.mk
+++ b/samples/WiFiDirectDemo/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := WiFiDirectDemo
 
 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 1682aa283..d675ad589 100644
--- a/samples/WiFiDirectServiceDiscovery/Android.mk
+++ b/samples/WiFiDirectServiceDiscovery/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := WiFiDirectServiceDiscovery
 
 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 0d015fd5c..08f57ffdc 100644
--- a/samples/Wiktionary/Android.mk
+++ b/samples/Wiktionary/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := Wiktionary
 
 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 670cd8210..59dc332c9 100644
--- a/samples/WiktionarySimple/Android.mk
+++ b/samples/WiktionarySimple/Android.mk
@@ -10,6 +10,8 @@ LOCAL_PACKAGE_NAME := WiktionarySimple
 
 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 6c46e1979..ebf90b2e2 100644
--- a/samples/XmlAdapters/Android.mk
+++ b/samples/XmlAdapters/Android.mk
@@ -12,6 +12,8 @@ LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_SDK_VERSION := 8
 
+LOCAL_DEX_PREOPT := false
+
 include $(BUILD_PACKAGE)
 
 # Use the following include to make our test apk.