From 7931bf753a828e7d440a9258aca44fa52f410781 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 15 May 2018 15:17:09 -0700 Subject: Use LOCAL_RENDERSCRIPT_TARGET_API := current Use current instead of 0 for targeting the current renderscript api. Bug: 79481102 Test: m java FORCE_AAPT2=true Change-Id: I912433b576c7d846be8a31d31d249fbd257f80ac --- tests/java_api/RSTestBackward/Android.mk | 2 +- tests/java_api/RSTestForward/21.1.2/Android.mk | 2 +- tests/java_api/RSTestForward/22.0.1/Android.mk | 2 +- tests/java_api/RSTestForward/23.0.3/Android.mk | 2 +- tests/java_api/RSTestForward/24.0.3/Android.mk | 2 +- tests/java_api/RSTestForward/25.0.2/Android.mk | 2 +- tests/java_api/RSTest_CompatLib/Android.mk | 2 +- tests/java_api/RSUnitTests/RSUnitTests.py | 2 +- tests/java_api/RsTest/Android.mk | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/java_api/RSTestBackward/Android.mk b/tests/java_api/RSTestBackward/Android.mk index 6c5e4572..10f8e82a 100644 --- a/tests/java_api/RSTestBackward/Android.mk +++ b/tests/java_api/RSTestBackward/Android.mk @@ -29,7 +29,7 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_MIN_SDK_VERSION := 21 LOCAL_SDK_VERSION := current diff --git a/tests/java_api/RSTestForward/21.1.2/Android.mk b/tests/java_api/RSTestForward/21.1.2/Android.mk index 2d5306ab..45b11ec3 100644 --- a/tests/java_api/RSTestForward/21.1.2/Android.mk +++ b/tests/java_api/RSTestForward/21.1.2/Android.mk @@ -29,7 +29,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_PACKAGE_NAME := RSTestForward_21_1_2 LOCAL_SDK_VERSION := current my_rs_path := $(TOP)/prebuilts/renderscript/host/linux-x86/21.1.2 diff --git a/tests/java_api/RSTestForward/22.0.1/Android.mk b/tests/java_api/RSTestForward/22.0.1/Android.mk index a98508a1..1b4905cd 100644 --- a/tests/java_api/RSTestForward/22.0.1/Android.mk +++ b/tests/java_api/RSTestForward/22.0.1/Android.mk @@ -29,7 +29,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_PACKAGE_NAME := RSTestForward_22_0_1 LOCAL_SDK_VERSION := current my_rs_path := $(TOP)/prebuilts/renderscript/host/linux-x86/22.0.1 diff --git a/tests/java_api/RSTestForward/23.0.3/Android.mk b/tests/java_api/RSTestForward/23.0.3/Android.mk index 0f806fb5..932a918d 100644 --- a/tests/java_api/RSTestForward/23.0.3/Android.mk +++ b/tests/java_api/RSTestForward/23.0.3/Android.mk @@ -29,7 +29,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_PACKAGE_NAME := RSTestForward_23_0_3 LOCAL_SDK_VERSION := current my_rs_path := $(TOP)/prebuilts/renderscript/host/linux-x86/23.0.3 diff --git a/tests/java_api/RSTestForward/24.0.3/Android.mk b/tests/java_api/RSTestForward/24.0.3/Android.mk index a4c8e72e..467cd03b 100644 --- a/tests/java_api/RSTestForward/24.0.3/Android.mk +++ b/tests/java_api/RSTestForward/24.0.3/Android.mk @@ -29,7 +29,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_PACKAGE_NAME := RSTestForward_24_0_3 LOCAL_SDK_VERSION := current my_rs_path := $(TOP)/prebuilts/renderscript/host/linux-x86/24.0.3 diff --git a/tests/java_api/RSTestForward/25.0.2/Android.mk b/tests/java_api/RSTestForward/25.0.2/Android.mk index 81def333..666a0598 100644 --- a/tests/java_api/RSTestForward/25.0.2/Android.mk +++ b/tests/java_api/RSTestForward/25.0.2/Android.mk @@ -29,7 +29,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := android-support-test LOCAL_COMPATIBILITY_SUITE := device-tests -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_PACKAGE_NAME := RSTestForward_25_0_2 LOCAL_SDK_VERSION := current my_rs_path := $(TOP)/prebuilts/renderscript/host/linux-x86/25.0.2 diff --git a/tests/java_api/RSTest_CompatLib/Android.mk b/tests/java_api/RSTest_CompatLib/Android.mk index 45420ebc..dd98b5b0 100644 --- a/tests/java_api/RSTest_CompatLib/Android.mk +++ b/tests/java_api/RSTest_CompatLib/Android.mk @@ -31,7 +31,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-test \ android-support-v8-renderscript \ -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_RENDERSCRIPT_COMPATIBILITY := true LOCAL_SDK_VERSION := current LOCAL_MIN_SDK_VERSION := 8 diff --git a/tests/java_api/RSUnitTests/RSUnitTests.py b/tests/java_api/RSUnitTests/RSUnitTests.py index ea3b6902..1bfb5edd 100644 --- a/tests/java_api/RSUnitTests/RSUnitTests.py +++ b/tests/java_api/RSUnitTests/RSUnitTests.py @@ -536,7 +536,7 @@ def WriteForwardMakefile(gen_file, build_tool_version, build_tool_version_name): 'LOCAL_MODULE_TAGS := tests\n' 'LOCAL_STATIC_JAVA_LIBRARIES := android-support-test\n' 'LOCAL_COMPATIBILITY_SUITE := device-tests\n' - 'LOCAL_RENDERSCRIPT_TARGET_API := 0\n' + 'LOCAL_RENDERSCRIPT_TARGET_API := current\n' 'LOCAL_PACKAGE_NAME := {}\n' 'LOCAL_SDK_VERSION := current\n' 'my_rs_path := $(TOP)/prebuilts/renderscript/host/linux-x86/{}\n' diff --git a/tests/java_api/RsTest/Android.mk b/tests/java_api/RsTest/Android.mk index 6516bc91..d0971432 100644 --- a/tests/java_api/RsTest/Android.mk +++ b/tests/java_api/RsTest/Android.mk @@ -26,7 +26,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under,../RSUnitTests/src) \ $(call all-renderscript-files-under,../RSUnitTests/src) \ -LOCAL_RENDERSCRIPT_TARGET_API := 0 +LOCAL_RENDERSCRIPT_TARGET_API := current LOCAL_PACKAGE_NAME := RSTest LOCAL_SDK_VERSION := current -- cgit v1.2.3