diff options
| author | Anton Hansson <hansson@google.com> | 2018-02-22 15:26:48 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2018-02-22 15:26:48 +0000 |
| commit | 37ca69d1aed1d45e1c9fee7dac9ac9d0f21f3cf1 (patch) | |
| tree | de315bec0d0a975f705b593508767a9b339af717 /tests | |
| parent | 40d40ad60d640c2d84d3a280bf989e6e486685fd (diff) | |
| download | rs-37ca69d1aed1d45e1c9fee7dac9ac9d0f21f3cf1.tar.gz | |
frameworks/rs: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug: 73535841
Change-Id: I04e2caab2614c2b7f6d5560c25b257f03cb2a81c
Diffstat (limited to 'tests')
27 files changed, 30 insertions, 3 deletions
diff --git a/tests/java_api/ImageProcessing_jb/Android.mk b/tests/java_api/ImageProcessing_jb/Android.mk index 8a2071be..ff67a845 100644 --- a/tests/java_api/ImageProcessing_jb/Android.mk +++ b/tests/java_api/ImageProcessing_jb/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_MODULE_TAGS := tests @@ -26,5 +26,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 5067f3f2..74a19da7 100644 --- a/tests/java_api/RSTestBackward/Android.mk +++ b/tests/java_api/RSTestBackward/Android.mk @@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir) 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 25e4ddf1..f14508ef 100644 --- a/tests/java_api/RSTestBackward19/Android.mk +++ b/tests/java_api/RSTestBackward19/Android.mk @@ -26,6 +26,7 @@ LOCAL_COMPATIBILITY_SUITE := device-tests 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 f21ddf7c..967c9400 100644 --- a/tests/java_api/RSTest_CompatLib/Android.mk +++ b/tests/java_api/RSTest_CompatLib/Android.mk @@ -18,6 +18,7 @@ LOCAL_PATH := $(call my-dir) 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 8c788256..e7d680e3 100644 --- a/tests/java_api/RSTest_CompatLib19/Android.mk +++ b/tests/java_api/RSTest_CompatLib19/Android.mk @@ -21,6 +21,7 @@ LOCAL_PATH := $(call my-dir) 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 89c72d40..932162cd 100644 --- a/tests/java_api/RsBLAS_Benchmark/Android.mk +++ b/tests/java_api/RsBLAS_Benchmark/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_STATIC_JAVA_LIBRARIES := android-support-test -LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base +LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs LOCAL_MODULE_TAGS := tests @@ -26,6 +26,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 6f84735f..ff0434d6 100644 --- a/tests/java_api/RsNbody/Android.mk +++ b/tests/java_api/RsNbody/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ 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 735b5bbf..6516bc91 100644 --- a/tests/java_api/RsTest/Android.mk +++ b/tests/java_api/RsTest/Android.mk @@ -29,6 +29,7 @@ LOCAL_SRC_FILES := \ 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 c6571bce..47bf9fba 100644 --- a/tests/java_api/SSHealingBrush/Android.mk +++ b/tests/java_api/SSHealingBrush/Android.mk @@ -25,6 +25,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ 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 3c6269db..c9e6dad2 100644 --- a/tests/java_api/ScriptGroupTest/Android.mk +++ b/tests/java_api/ScriptGroupTest/Android.mk @@ -19,7 +19,7 @@ include $(CLEAR_VARS) 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_SRC_FILES := $(call all-java-files-under, src) \ 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 a62d3a65..f7de2af6 100644 --- a/tests/lldb/java/Allocations/Android.mk +++ b/tests/lldb/java/Allocations/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES := \ $(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 ce6ebce7..ae79a64a 100644 --- a/tests/lldb/java/BranchingFunCalls/Android.mk +++ b/tests/lldb/java/BranchingFunCalls/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES := \ $(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 15f1dbc3..8eafa53a 100644 --- a/tests/lldb/java/DebugWaitAttach/Android.mk +++ b/tests/lldb/java/DebugWaitAttach/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 d8bb4e1f..d2f143c7 100644 --- a/tests/lldb/java/InfiniteLoop/Android.mk +++ b/tests/lldb/java/InfiniteLoop/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 c562e76c..f37abced 100644 --- a/tests/lldb/java/KernelVariables/Android.mk +++ b/tests/lldb/java/KernelVariables/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 cd2295b1..b7cb887d 100644 --- a/tests/lldb/java/MultipleRSFiles/Android.mk +++ b/tests/lldb/java/MultipleRSFiles/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 64e32ed7..a852a526 100644 --- a/tests/lldb/java/NoDebugWaitAttach/Android.mk +++ b/tests/lldb/java/NoDebugWaitAttach/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 d3139a4c..bd0d5a51 100644 --- a/tests/lldb/java/Reduction/Android.mk +++ b/tests/lldb/java/Reduction/Android.mk @@ -24,5 +24,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil 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 3540ed46..c673b67c 100644 --- a/tests/lldb/java/ScriptGroup/Android.mk +++ b/tests/lldb/java/ScriptGroup/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 fa100632..09bfc4e0 100644 --- a/tests/lldb/java/SingleSource/Android.mk +++ b/tests/lldb/java/SingleSource/Android.mk @@ -6,6 +6,7 @@ LOCAL_MODULE_TAGS := tests 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 81695a0e..8b0793b6 100644 --- a/tests/lldb/jni/Allocations/Android.mk +++ b/tests/lldb/jni/Allocations/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 48fa26c2..5fdcdb31 100644 --- a/tests/lldb/jni/BranchingFunCalls/Android.mk +++ b/tests/lldb/jni/BranchingFunCalls/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 5e577281..9d848425 100644 --- a/tests/lldb/jni/DebugWaitAttach/Android.mk +++ b/tests/lldb/jni/DebugWaitAttach/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 4d371718..35dfc0d5 100644 --- a/tests/lldb/jni/InfiniteLoop/Android.mk +++ b/tests/lldb/jni/InfiniteLoop/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 2d471345..8ab1297d 100644 --- a/tests/lldb/jni/KernelVariables/Android.mk +++ b/tests/lldb/jni/KernelVariables/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 00fad61a..4aa54e3b 100644 --- a/tests/lldb/jni/MultipleRSFiles/Android.mk +++ b/tests/lldb/jni/MultipleRSFiles/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(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 835140ae..84d4e28b 100644 --- a/tests/lldb/jni/NoDebugWaitAttach/Android.mk +++ b/tests/lldb/jni/NoDebugWaitAttach/Android.mk @@ -7,6 +7,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-renderscript-files-under, src) LOCAL_PACKAGE_NAME := JNINoDebugWaitAttach +LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjninodebugwaitattach |