diff options
| author | Jason Sams <jsams@google.com> | 2012-11-30 13:26:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 13:26:03 -0800 |
| commit | 131549dd7b264e138562e8268ac45d6b0ef919e2 (patch) | |
| tree | f274e3e789b072b4fa8c9484ad46f3ebd9fabaf8 | |
| parent | c1d1ececd83104c3de889928175b9f4fdcbbb131 (diff) | |
| parent | 98a09c64d52aa1166a09ab071049bc3536def1cd (diff) | |
| download | frameworks_base-131549dd7b264e138562e8268ac45d6b0ef919e2.zip frameworks_base-131549dd7b264e138562e8268ac45d6b0ef919e2.tar.gz frameworks_base-131549dd7b264e138562e8268ac45d6b0ef919e2.tar.bz2 | |
am 98a09c64: am 43174b7d: am 718fb9f1: Fix sample code issues
* commit '98a09c64d52aa1166a09ab071049bc3536def1cd':
Fix sample code issues
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs (renamed from tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7836737..01d09f6 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -140,6 +140,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ui/*.ogg) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.java) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.P) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml b/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml index 2232b98..d51fa39 100644 --- a/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml +++ b/tests/RenderScriptTests/ImageProcessing/AndroidManifest.xml @@ -3,7 +3,7 @@ <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-sdk android:minSdkVersion="11" /> + <uses-sdk android:minSdkVersion="17" /> <application android:label="Image Processing" android:hardwareAccelerated="true"> <uses-library android:name="android.test.runner" /> diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs index ac2061b..ac2061b 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.fs +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/mandelbrot.rs |