Build all samples against SDK.
Change-Id: I9ea35c07a7f9d2e2a42d952101e99528fd68fb6c
diff --git a/samples/BrowserPlugin/Android.mk b/samples/BrowserPlugin/Android.mk
index 827700f..1eee450 100644
--- a/samples/BrowserPlugin/Android.mk
+++ b/samples/BrowserPlugin/Android.mk
@@ -30,6 +30,9 @@
LOCAL_JNI_SHARED_LIBRARIES := libsampleplugin
+# TODO: doesn't compile with this set
+#LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
# ============================================================
diff --git a/samples/GlobalTime/Android.mk b/samples/GlobalTime/Android.mk
index deb82f5..a390faa 100644
--- a/samples/GlobalTime/Android.mk
+++ b/samples/GlobalTime/Android.mk
@@ -7,4 +7,7 @@
LOCAL_PACKAGE_NAME := GlobalTime
+# TODO: build fails with this set
+# LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/HelloActivity/tests/Android.mk b/samples/HelloActivity/tests/Android.mk
index abd9a8e..b4a0157 100644
--- a/samples/HelloActivity/tests/Android.mk
+++ b/samples/HelloActivity/tests/Android.mk
@@ -11,4 +11,6 @@
LOCAL_INSTRUMENTATION_FOR := HelloActivity
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/JetBoy/Android.mk b/samples/JetBoy/Android.mk
index 2e6b571..9adb663 100755
--- a/samples/JetBoy/Android.mk
+++ b/samples/JetBoy/Android.mk
@@ -7,4 +7,6 @@
LOCAL_PACKAGE_NAME := JETBoy
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/LunarLander/tests/Android.mk b/samples/LunarLander/tests/Android.mk
index 60208cf..08e66f0 100644
--- a/samples/LunarLander/tests/Android.mk
+++ b/samples/LunarLander/tests/Android.mk
@@ -11,4 +11,6 @@
LOCAL_INSTRUMENTATION_FOR := LunarLander
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/RenderScript/Fountain/Android.mk b/samples/RenderScript/Fountain/Android.mk
index ecc330c..2049ecf 100644
--- a/samples/RenderScript/Fountain/Android.mk
+++ b/samples/RenderScript/Fountain/Android.mk
@@ -21,6 +21,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
+# TODO: build fails with this set
+# LOCAL_SDK_VERSION := current
+
LOCAL_PACKAGE_NAME := RsFountain
include $(BUILD_PACKAGE)
diff --git a/samples/RenderScript/HelloWorld/Android.mk b/samples/RenderScript/HelloWorld/Android.mk
index 48a6ffd..2af1cdb 100644
--- a/samples/RenderScript/HelloWorld/Android.mk
+++ b/samples/RenderScript/HelloWorld/Android.mk
@@ -23,4 +23,6 @@
LOCAL_PACKAGE_NAME := RsHelloWorld
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/RenderScript/MiscSamples/Android.mk b/samples/RenderScript/MiscSamples/Android.mk
index 6bab9c6..6b8b691 100644
--- a/samples/RenderScript/MiscSamples/Android.mk
+++ b/samples/RenderScript/MiscSamples/Android.mk
@@ -23,4 +23,6 @@
LOCAL_PACKAGE_NAME := RsMiscSamples
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/SimpleJNI/Android.mk b/samples/SimpleJNI/Android.mk
index edada37..a9600ef 100644
--- a/samples/SimpleJNI/Android.mk
+++ b/samples/SimpleJNI/Android.mk
@@ -34,6 +34,8 @@
LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
# ============================================================
diff --git a/samples/SkeletonApp/tests/Android.mk b/samples/SkeletonApp/tests/Android.mk
index 7f26bfa..d466423 100644
--- a/samples/SkeletonApp/tests/Android.mk
+++ b/samples/SkeletonApp/tests/Android.mk
@@ -11,4 +11,6 @@
LOCAL_INSTRUMENTATION_FOR := SkeletonApp
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/Snake/tests/Android.mk b/samples/Snake/tests/Android.mk
index 3d16805..1d3677a 100644
--- a/samples/Snake/tests/Android.mk
+++ b/samples/Snake/tests/Android.mk
@@ -11,4 +11,6 @@
LOCAL_INSTRUMENTATION_FOR := Snake
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/TtsEngine/Android.mk b/samples/TtsEngine/Android.mk
index 30569ac..a400ef1 100644
--- a/samples/TtsEngine/Android.mk
+++ b/samples/TtsEngine/Android.mk
@@ -7,5 +7,7 @@
LOCAL_PACKAGE_NAME := TtsEngine
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
diff --git a/samples/XmlAdapters/Android.mk b/samples/XmlAdapters/Android.mk
index a2cad3a..e12ce57 100644
--- a/samples/XmlAdapters/Android.mk
+++ b/samples/XmlAdapters/Android.mk
@@ -10,6 +10,8 @@
LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_SDK_VERSION := current
+
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
