commit 81a27446a0586169e44089969d7fc12d8072426d
author Jason Sams <rjsams@android.com> Mon Feb 07 13:59:45 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 07 13:59:45 2011 -0800
tree 7ecb4963bb38c5ce44e18517af927ab0240073fb
parent 681e81e5b62116e3ae32262aac90d8555241816e
parent 3f20dc53d755b4500d15a30828509f9c0ac869f0

Merge "cleanup headers for SDK. bug 3421901" into honeycomb

java/Balls/AndroidManifest.xml

diff --git a/java/Balls/AndroidManifest.xml b/java/Balls/AndroidManifest.xml
index 2fffc5f..f3384ec 100644
--- a/java/Balls/AndroidManifest.xml
+++ b/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">

java/Fountain/AndroidManifest.xml

diff --git a/java/Fountain/AndroidManifest.xml b/java/Fountain/AndroidManifest.xml
index 951c451..5126e5c 100644
--- a/java/Fountain/AndroidManifest.xml
+++ b/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">

java/ImageProcessing/AndroidManifest.xml

diff --git a/java/ImageProcessing/AndroidManifest.xml b/java/ImageProcessing/AndroidManifest.xml
index d6a2db4..0fcbf1e 100644
--- a/java/ImageProcessing/AndroidManifest.xml
+++ b/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">

java/Samples/AndroidManifest.xml

diff --git a/java/Samples/AndroidManifest.xml b/java/Samples/AndroidManifest.xml
index 9646a77..8dad161 100644
--- a/java/Samples/AndroidManifest.xml
+++ b/java/Samples/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.samples">
+    <uses-sdk android:minSdkVersion="11" />
     <application android:label="Samples"
     android:icon="@drawable/test_pattern">
         <activity android:name="RsList"

rsScriptC_Lib.cpp

diff --git a/rsScriptC_Lib.cpp b/rsScriptC_Lib.cpp
index 8a85f6e..80da8ae 100644
--- a/rsScriptC_Lib.cpp
+++ b/rsScriptC_Lib.cpp
@@ -856,6 +856,8 @@
     { "__modsi3", (void *)&SC_modsi3, true },
     { "__udivsi3", (void *)&SC_udivsi3, true },
     { "__umodsi3", (void *)&SC_umodsi3, true },
+    { "memset", (void *)&memset, true },
+    { "memcpy", (void *)&memcpy, true },
 
     // allocation
     { "_Z19rsAllocationGetDimX13rs_allocation", (void *)&SC_allocGetDimX, true },