commit d93f0d87960e484971e2c1912d747c2922e36a0f
author Miao Wang <miaowang@google.com> Thu Mar 31 22:10:50 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 31 22:10:50 2016 +0000
tree d402a711b384d273480eb5d85116cee5675b55b6
parent 8aa84dc35af1415fe561c2d2d4ceddacac1a893f
parent bc721e68519d8ba78262391e6bbc843dee11903c

Merge "Clean-up makefiles for test applications."

java/tests/HealingBrush/Android.mk

diff --git a/java/tests/HealingBrush/Android.mk b/java/tests/HealingBrush/Android.mk
index b8d40fe..ed974e8 100644
--- a/java/tests/HealingBrush/Android.mk
+++ b/java/tests/HealingBrush/Android.mk
@@ -37,7 +37,4 @@
 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 LOCAL_JNI_SHARED_LIBRARIES := librsjni
 
-LOCAL_32_BIT_ONLY := true
-
 include $(BUILD_PACKAGE)
-

java/tests/ImageProcessing/Android.mk

diff --git a/java/tests/ImageProcessing/Android.mk b/java/tests/ImageProcessing/Android.mk
index d7486e8..7ea6f6e 100644
--- a/java/tests/ImageProcessing/Android.mk
+++ b/java/tests/ImageProcessing/Android.mk
@@ -23,7 +23,6 @@
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src) \
                    $(call all-renderscript-files-under, src)
-#LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript
 
 LOCAL_PACKAGE_NAME := ImageProcessing
 

java/tests/ImageProcessing2/Android.mk

diff --git a/java/tests/ImageProcessing2/Android.mk b/java/tests/ImageProcessing2/Android.mk
index 9c53d91..ad2bc52 100644
--- a/java/tests/ImageProcessing2/Android.mk
+++ b/java/tests/ImageProcessing2/Android.mk
@@ -33,8 +33,5 @@
 
 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 LOCAL_JNI_SHARED_LIBRARIES := librsjni
-LOCAL_32_BIT_ONLY := true
 
 include $(BUILD_PACKAGE)
-
-#include $(call all-makefiles-under, $(LOCAL_PATH))

java/tests/Refocus/Android.mk

diff --git a/java/tests/Refocus/Android.mk b/java/tests/Refocus/Android.mk
index 13ccc22..887f894 100644
--- a/java/tests/Refocus/Android.mk
+++ b/java/tests/Refocus/Android.mk
@@ -37,6 +37,5 @@
 
 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 LOCAL_JNI_SHARED_LIBRARIES := librsjni
-LOCAL_32_BIT_ONLY := true
 
 include $(BUILD_PACKAGE)

java/tests/RsBLAS_Benchmark/libsgemm/Android.mk

diff --git a/java/tests/RsBLAS_Benchmark/libsgemm/Android.mk b/java/tests/RsBLAS_Benchmark/libsgemm/Android.mk
index 21194e9..9327869 100644
--- a/java/tests/RsBLAS_Benchmark/libsgemm/Android.mk
+++ b/java/tests/RsBLAS_Benchmark/libsgemm/Android.mk
@@ -22,6 +22,7 @@
 LOCAL_MODULE := libgemmdata
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := test_data.cpp
+LOCAL_SDK_VERSION := 14
 
 LOCAL_C_INCLUDES := $(JNI_H_INCLUDE)