diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-10-14 13:35:21 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-10-14 13:35:21 -0700 |
| commit | 23a2c44da9aa2ba3782966c2c23b598462392ce9 (patch) | |
| tree | aa5080f6aec38b069d5fefac7582130e51a4cd84 /renderScript | |
| parent | 1b79ba900efd074a12c51145be9ff4e934bdc488 (diff) | |
| download | android-23a2c44da9aa2ba3782966c2c23b598462392ce9.tar.gz | |
Remove <uses-sdk> block from all samples
This value is now automatically merged in from build.gradle (which is
managed by template-params.xml). Removing it prevents conflicts in
the event uses-sdk doesn't match properly.
Change-Id: Icbe4aabac366a26a326cfa2ecd2cb57192634a1a
Diffstat (limited to 'renderScript')
5 files changed, 5 insertions, 15 deletions
diff --git a/renderScript/BasicRenderScript/Application/AndroidManifest.xml b/renderScript/BasicRenderScript/Application/AndroidManifest.xml index 1e35dc30..21c3a621 100644 --- a/renderScript/BasicRenderScript/Application/AndroidManifest.xml +++ b/renderScript/BasicRenderScript/Application/AndroidManifest.xml @@ -4,9 +4,7 @@ android:versionCode="1" android:versionName="1.0" > - <uses-sdk - android:minSdkVersion="8" - android:targetSdkVersion="19" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" diff --git a/renderScript/BasicRenderScript/Application/src/main/AndroidManifest.xml b/renderScript/BasicRenderScript/Application/src/main/AndroidManifest.xml index e1e2dfc1..3bc65ffa 100644 --- a/renderScript/BasicRenderScript/Application/src/main/AndroidManifest.xml +++ b/renderScript/BasicRenderScript/Application/src/main/AndroidManifest.xml @@ -20,9 +20,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk - android:minSdkVersion="8" - android:targetSdkVersion="19" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" diff --git a/renderScript/BasicRenderScript/Application/tests/AndroidManifest.xml b/renderScript/BasicRenderScript/Application/tests/AndroidManifest.xml index 02a8db36..34eca025 100644 --- a/renderScript/BasicRenderScript/Application/tests/AndroidManifest.xml +++ b/renderScript/BasicRenderScript/Application/tests/AndroidManifest.xml @@ -20,9 +20,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk - android:minSdkVersion="8" - android:targetSdkVersion="19" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <!-- We add an application tag here just so that we can indicate that this package needs to link against the android.test library, diff --git a/renderScript/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml b/renderScript/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml index 566ef8ae..e108aff2 100644 --- a/renderScript/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml +++ b/renderScript/RenderScriptIntrinsic/Application/src/main/AndroidManifest.xml @@ -20,9 +20,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk - android:minSdkVersion="8" - android:targetSdkVersion="19" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <application android:allowBackup="true" diff --git a/renderScript/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml b/renderScript/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml index 96fa2079..72f0969a 100644 --- a/renderScript/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml +++ b/renderScript/RenderScriptIntrinsic/Application/tests/AndroidManifest.xml @@ -20,9 +20,7 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk - android:minSdkVersion="8" - android:targetSdkVersion="19" /> + <!-- Min/target SDK versions (<uses-sdk>) managed by build.gradle --> <!-- We add an application tag here just so that we can indicate that this package needs to link against the android.test library, |