Merge "Fix up the makefiles and some samples."

2016-04-20 19:09:00 +00:00
parent d66a831ffc 0e2da18081
commit 2473cabd0d
57 changed files with 113 additions and 6 deletions
--- 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.
--- 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)
--- 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)
--- 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.
--- 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
--- 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)
--- 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)
--- 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.
--- 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.
--- 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)
--- 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.
--- 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.
--- 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)
--- 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)
--- 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)

--- 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.
--- 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)
--- 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)
--- 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.
--- 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)
--- 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.
--- 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.
--- 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.
--- 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)
--- 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.
--- 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.
--- 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)
--- 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.
--- 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.
--- 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.
--- 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)
--- 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)

 # ============================================================
--- 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)
--- 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.
--- 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.
--- 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.
--- 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)
--- 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.
--- 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.
--- 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.
--- 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 \
--- 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
--- 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 \
--- 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 \
--- 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 \
--- 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.
--- 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)

--- 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" />

--- 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)
--- 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)
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.
--- 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.