Merge "frameworks/rs: Set LOCAL_SDK_VERSION where possible."
diff --git a/rsov/tests/RSoVTest/Android.mk b/rsov/tests/RSoVTest/Android.mk
index 882de99..7659b10 100644
--- a/rsov/tests/RSoVTest/Android.mk
+++ b/rsov/tests/RSoVTest/Android.mk
@@ -25,5 +25,6 @@
LOCAL_RENDERSCRIPT_FLAGS := -target-api 0
LOCAL_PACKAGE_NAME := RSoVTest
+LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)
diff --git a/tests/java_api/ImageProcessing_jb/Android.mk b/tests/java_api/ImageProcessing_jb/Android.mk
index 7d27611..3ca65c7 100644
--- a/tests/java_api/ImageProcessing_jb/Android.mk
+++ b/tests/java_api/ImageProcessing_jb/Android.mk
@@ -17,8 +17,8 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
LOCAL_MODULE_TAGS := tests
@@ -26,5 +26,6 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := ImageProcessingJB
+LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)
diff --git a/tests/java_api/RSTestBackward/Android.mk b/tests/java_api/RSTestBackward/Android.mk
index 5067f3f..74a19da 100644
--- a/tests/java_api/RSTestBackward/Android.mk
+++ b/tests/java_api/RSTestBackward/Android.mk
@@ -18,6 +18,7 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := RSTestBackward
+LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := \
diff --git a/tests/java_api/RSTestBackward19/Android.mk b/tests/java_api/RSTestBackward19/Android.mk
index 25e4ddf..f14508e 100644
--- a/tests/java_api/RSTestBackward19/Android.mk
+++ b/tests/java_api/RSTestBackward19/Android.mk
@@ -26,6 +26,7 @@
LOCAL_RENDERSCRIPT_TARGET_API := 19
LOCAL_MIN_SDK_VERSION := 17
LOCAL_PACKAGE_NAME := RSTestBackward19
+LOCAL_SDK_VERSION := current
my_rs_unit_tests_path := ../RSUnitTests/src/com/android/rs/unittest
LOCAL_SRC_FILES :=\
$(call all-java-files-under,src)\
diff --git a/tests/java_api/RSTest_CompatLib/Android.mk b/tests/java_api/RSTest_CompatLib/Android.mk
index f21ddf7..967c940 100644
--- a/tests/java_api/RSTest_CompatLib/Android.mk
+++ b/tests/java_api/RSTest_CompatLib/Android.mk
@@ -18,6 +18,7 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := RSTest_Compat
+LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := \
diff --git a/tests/java_api/RSTest_CompatLib19/Android.mk b/tests/java_api/RSTest_CompatLib19/Android.mk
index 8c78825..e7d680e 100644
--- a/tests/java_api/RSTest_CompatLib19/Android.mk
+++ b/tests/java_api/RSTest_CompatLib19/Android.mk
@@ -21,6 +21,7 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := RSTest_Compat19
+LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/tests/java_api/RsBLAS_Benchmark/Android.mk b/tests/java_api/RsBLAS_Benchmark/Android.mk
index 42692b8..895e50f 100644
--- a/tests/java_api/RsBLAS_Benchmark/Android.mk
+++ b/tests/java_api/RsBLAS_Benchmark/Android.mk
@@ -17,8 +17,8 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-test legacy-android-test
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
LOCAL_MODULE_TAGS := tests
@@ -26,6 +26,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := RsBlasBenchmark
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libgemmdata
include $(BUILD_PACKAGE)
diff --git a/tests/java_api/RsNbody/Android.mk b/tests/java_api/RsNbody/Android.mk
index 6f84735..ff0434d 100644
--- a/tests/java_api/RsNbody/Android.mk
+++ b/tests/java_api/RsNbody/Android.mk
@@ -25,6 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_PACKAGE_NAME := RsNbody
+LOCAL_SDK_VERSION := current
LOCAL_RENDERSCRIPT_TARGET_API := 23
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
diff --git a/tests/java_api/RsTest/Android.mk b/tests/java_api/RsTest/Android.mk
index 735b5bb..6516bc9 100644
--- a/tests/java_api/RsTest/Android.mk
+++ b/tests/java_api/RsTest/Android.mk
@@ -29,6 +29,7 @@
LOCAL_RENDERSCRIPT_TARGET_API := 0
LOCAL_PACKAGE_NAME := RSTest
+LOCAL_SDK_VERSION := current
LOCAL_COMPATIBILITY_SUITE := device-tests
include $(BUILD_PACKAGE)
diff --git a/tests/java_api/SSHealingBrush/Android.mk b/tests/java_api/SSHealingBrush/Android.mk
index c6571bc..47bf9fb 100644
--- a/tests/java_api/SSHealingBrush/Android.mk
+++ b/tests/java_api/SSHealingBrush/Android.mk
@@ -25,6 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-v8-renderscript
LOCAL_PACKAGE_NAME := SSHealingBrush
+LOCAL_SDK_VERSION := current
LOCAL_RENDERSCRIPT_FLAGS := -target-api 0
diff --git a/tests/java_api/ScriptGroupTest/Android.mk b/tests/java_api/ScriptGroupTest/Android.mk
index 3c6269d..c9e6dad 100644
--- a/tests/java_api/ScriptGroupTest/Android.mk
+++ b/tests/java_api/ScriptGroupTest/Android.mk
@@ -19,7 +19,7 @@
LOCAL_MODULE_TAGS := tests
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
@@ -28,5 +28,6 @@
LOCAL_RENDERSCRIPT_FLAGS := -target-api 0
LOCAL_PACKAGE_NAME := ScriptGroupTest
+LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)
diff --git a/tests/lldb/java/Allocations/Android.mk b/tests/lldb/java/Allocations/Android.mk
index a62d3a6..f7de2af 100644
--- a/tests/lldb/java/Allocations/Android.mk
+++ b/tests/lldb/java/Allocations/Android.mk
@@ -8,6 +8,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := Allocations
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -Wno-unused -target-api 0
diff --git a/tests/lldb/java/BranchingFunCalls/Android.mk b/tests/lldb/java/BranchingFunCalls/Android.mk
index ce6ebce..ae79a64 100644
--- a/tests/lldb/java/BranchingFunCalls/Android.mk
+++ b/tests/lldb/java/BranchingFunCalls/Android.mk
@@ -8,6 +8,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := BranchingFunCalls
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/java/DebugWaitAttach/Android.mk b/tests/lldb/java/DebugWaitAttach/Android.mk
index 15f1dbc..8eafa53 100644
--- a/tests/lldb/java/DebugWaitAttach/Android.mk
+++ b/tests/lldb/java/DebugWaitAttach/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JavaDebugWaitAttach
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/java/InfiniteLoop/Android.mk b/tests/lldb/java/InfiniteLoop/Android.mk
index d8bb4e1..d2f143c 100644
--- a/tests/lldb/java/InfiniteLoop/Android.mk
+++ b/tests/lldb/java/InfiniteLoop/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JavaInfiniteLoop
+LOCAL_SDK_VERSION := current
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/java/KernelVariables/Android.mk b/tests/lldb/java/KernelVariables/Android.mk
index c562e76..f37abce 100644
--- a/tests/lldb/java/KernelVariables/Android.mk
+++ b/tests/lldb/java/KernelVariables/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := KernelVariables
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/java/MultipleRSFiles/Android.mk b/tests/lldb/java/MultipleRSFiles/Android.mk
index cd2295b..b7cb887 100644
--- a/tests/lldb/java/MultipleRSFiles/Android.mk
+++ b/tests/lldb/java/MultipleRSFiles/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := MultipleRSFiles
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/java/NoDebugWaitAttach/Android.mk b/tests/lldb/java/NoDebugWaitAttach/Android.mk
index 64e32ed..a852a52 100644
--- a/tests/lldb/java/NoDebugWaitAttach/Android.mk
+++ b/tests/lldb/java/NoDebugWaitAttach/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JavaNoDebugWaitAttach
+LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)
diff --git a/tests/lldb/java/Reduction/Android.mk b/tests/lldb/java/Reduction/Android.mk
index d3139a4..bd0d5a5 100644
--- a/tests/lldb/java/Reduction/Android.mk
+++ b/tests/lldb/java/Reduction/Android.mk
@@ -24,5 +24,6 @@
LOCAL_RENDERSCRIPT_FLAGS := -target-api 0 -O0 -g
LOCAL_PACKAGE_NAME := Reduction
+LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)
diff --git a/tests/lldb/java/ScriptGroup/Android.mk b/tests/lldb/java/ScriptGroup/Android.mk
index 3540ed4..c673b67 100644
--- a/tests/lldb/java/ScriptGroup/Android.mk
+++ b/tests/lldb/java/ScriptGroup/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := ScriptGroup
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/java/SingleSource/Android.mk b/tests/lldb/java/SingleSource/Android.mk
index fa10063..09bfc4e 100644
--- a/tests/lldb/java/SingleSource/Android.mk
+++ b/tests/lldb/java/SingleSource/Android.mk
@@ -6,6 +6,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := SingleSource
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_RENDERSCRIPT_FLAGS := -g -O0 -target-api 0
diff --git a/tests/lldb/jni/Allocations/Android.mk b/tests/lldb/jni/Allocations/Android.mk
index 81695a0..8b0793b 100644
--- a/tests/lldb/jni/Allocations/Android.mk
+++ b/tests/lldb/jni/Allocations/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIAllocations
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjniallocations
diff --git a/tests/lldb/jni/BranchingFunCalls/Android.mk b/tests/lldb/jni/BranchingFunCalls/Android.mk
index 48fa26c..5fdcdb3 100644
--- a/tests/lldb/jni/BranchingFunCalls/Android.mk
+++ b/tests/lldb/jni/BranchingFunCalls/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIBranchingFunCalls
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnibranchingfuncalls
diff --git a/tests/lldb/jni/DebugWaitAttach/Android.mk b/tests/lldb/jni/DebugWaitAttach/Android.mk
index 5e57728..9d84842 100644
--- a/tests/lldb/jni/DebugWaitAttach/Android.mk
+++ b/tests/lldb/jni/DebugWaitAttach/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIDebugWaitAttach
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnidebugwaitattach
diff --git a/tests/lldb/jni/InfiniteLoop/Android.mk b/tests/lldb/jni/InfiniteLoop/Android.mk
index 4d37171..35dfc0d 100644
--- a/tests/lldb/jni/InfiniteLoop/Android.mk
+++ b/tests/lldb/jni/InfiniteLoop/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIInfiniteLoop
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjniinfiniteloop
diff --git a/tests/lldb/jni/KernelVariables/Android.mk b/tests/lldb/jni/KernelVariables/Android.mk
index 2d47134..8ab1297 100644
--- a/tests/lldb/jni/KernelVariables/Android.mk
+++ b/tests/lldb/jni/KernelVariables/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIKernelVariables
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnikernelvariables
diff --git a/tests/lldb/jni/MultipleRSFiles/Android.mk b/tests/lldb/jni/MultipleRSFiles/Android.mk
index 00fad61..4aa54e3 100644
--- a/tests/lldb/jni/MultipleRSFiles/Android.mk
+++ b/tests/lldb/jni/MultipleRSFiles/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNIMultipleRSFiles
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjnimultiplersfiles
diff --git a/tests/lldb/jni/NoDebugWaitAttach/Android.mk b/tests/lldb/jni/NoDebugWaitAttach/Android.mk
index 835140a..84d4e28 100644
--- a/tests/lldb/jni/NoDebugWaitAttach/Android.mk
+++ b/tests/lldb/jni/NoDebugWaitAttach/Android.mk
@@ -7,6 +7,7 @@
$(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := JNINoDebugWaitAttach
+LOCAL_SDK_VERSION := current
LOCAL_JNI_SHARED_LIBRARIES := libjninodebugwaitattach
