summaryrefslogtreecommitdiffstats
path: root/libs/rs
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2011-02-07 13:51:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-07 13:51:03 -0800
commita5c8eb76f5f7bfbc5d53f2cd2c6f0a23a2fe8712 (patch)
treebec9c5644926be744787ace8c19fd897029c7476 /libs/rs
parent0bf9f7066b44a50b3954466f12930aec296733f9 (diff)
parent7eca7f742a31654a3240f70611ac8c82705d2b42 (diff)
downloadframeworks_base-a5c8eb76f5f7bfbc5d53f2cd2c6f0a23a2fe8712.zip
frameworks_base-a5c8eb76f5f7bfbc5d53f2cd2c6f0a23a2fe8712.tar.gz
frameworks_base-a5c8eb76f5f7bfbc5d53f2cd2c6f0a23a2fe8712.tar.bz2
am 7eca7f74: am 5cf98da8: Merge "Fixing renderscript samples to properly declare targetSDK" into honeycomb
* commit '7eca7f742a31654a3240f70611ac8c82705d2b42': Fixing renderscript samples to properly declare targetSDK
Diffstat (limited to 'libs/rs')
-rw-r--r--libs/rs/java/Balls/AndroidManifest.xml1
-rw-r--r--libs/rs/java/Fountain/AndroidManifest.xml1
-rw-r--r--libs/rs/java/ImageProcessing/AndroidManifest.xml4
3 files changed, 4 insertions, 2 deletions
diff --git a/libs/rs/java/Balls/AndroidManifest.xml b/libs/rs/java/Balls/AndroidManifest.xml
index 2fffc5f..f3384ec 100644
--- a/libs/rs/java/Balls/AndroidManifest.xml
+++ b/libs/rs/java/Balls/AndroidManifest.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.balls">
+ <uses-sdk android:minSdkVersion="11" />
<application
android:label="Balls"
android:icon="@drawable/test_pattern">
diff --git a/libs/rs/java/Fountain/AndroidManifest.xml b/libs/rs/java/Fountain/AndroidManifest.xml
index 951c451..5126e5c 100644
--- a/libs/rs/java/Fountain/AndroidManifest.xml
+++ b/libs/rs/java/Fountain/AndroidManifest.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.fountain">
+ <uses-sdk android:minSdkVersion="11" />
<application
android:label="Fountain"
android:icon="@drawable/test_pattern">
diff --git a/libs/rs/java/ImageProcessing/AndroidManifest.xml b/libs/rs/java/ImageProcessing/AndroidManifest.xml
index d6a2db4..0fcbf1e 100644
--- a/libs/rs/java/ImageProcessing/AndroidManifest.xml
+++ b/libs/rs/java/ImageProcessing/AndroidManifest.xml
@@ -3,8 +3,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.rs.image">
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-sdk android:minSdkVersion="11" />
<application android:label="Image Processing">
<activity android:name="ImageProcessingActivity"
android:screenOrientation="portrait">