diff options
| author | Arthur Eubanks <aeubanks@google.com> | 2018-03-23 23:34:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-23 23:34:58 +0000 |
| commit | 3988ca13d3a6cb1ff2331ffca36cba2b6b5b5347 (patch) | |
| tree | 8da2e1caa33ded921012b358f327dab53267031a /tests/java_api | |
| parent | 6b0a096ac5e9c3f6d2018e36e4f91ca4dd53b094 (diff) | |
| parent | 4d0275a2ef96e453533cf3dbdf1d812e5f875432 (diff) | |
| download | rs-3988ca13d3a6cb1ff2331ffca36cba2b6b5b5347.tar.gz | |
Merge "Remove small_struct test from slang 24 and 25" am: 29eaaa8e56
am: 4d0275a2ef
Change-Id: Id8c4e6c79f0b7172e55714360c49bff9b1bd0543
Diffstat (limited to 'tests/java_api')
| -rw-r--r-- | tests/java_api/RSTestForward/24.0.3/Android.mk | 2 | ||||
| -rw-r--r-- | tests/java_api/RSTestForward/25.0.2/Android.mk | 2 | ||||
| -rw-r--r-- | tests/java_api/RSUnitTests/RSUnitTests.py | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/tests/java_api/RSTestForward/24.0.3/Android.mk b/tests/java_api/RSTestForward/24.0.3/Android.mk index 823c4ac5..a4c8e72e 100644 --- a/tests/java_api/RSTestForward/24.0.3/Android.mk +++ b/tests/java_api/RSTestForward/24.0.3/Android.mk @@ -149,8 +149,6 @@ LOCAL_SRC_FILES :=\ $(my_rs_unit_tests_path)/single_source_ref_count.rs\ $(my_rs_unit_tests_path)/UT_single_source_script.java\ $(my_rs_unit_tests_path)/single_source_script.rs\ - $(my_rs_unit_tests_path)/UT_small_struct.java\ - $(my_rs_unit_tests_path)/small_struct.rs\ $(my_rs_unit_tests_path)/UT_small_struct_2.java\ $(my_rs_unit_tests_path)/small_struct_2.rs\ $(my_rs_unit_tests_path)/UT_static_globals.java\ diff --git a/tests/java_api/RSTestForward/25.0.2/Android.mk b/tests/java_api/RSTestForward/25.0.2/Android.mk index a6a3d6ee..81def333 100644 --- a/tests/java_api/RSTestForward/25.0.2/Android.mk +++ b/tests/java_api/RSTestForward/25.0.2/Android.mk @@ -149,8 +149,6 @@ LOCAL_SRC_FILES :=\ $(my_rs_unit_tests_path)/single_source_ref_count.rs\ $(my_rs_unit_tests_path)/UT_single_source_script.java\ $(my_rs_unit_tests_path)/single_source_script.rs\ - $(my_rs_unit_tests_path)/UT_small_struct.java\ - $(my_rs_unit_tests_path)/small_struct.rs\ $(my_rs_unit_tests_path)/UT_small_struct_2.java\ $(my_rs_unit_tests_path)/small_struct_2.rs\ $(my_rs_unit_tests_path)/UT_static_globals.java\ diff --git a/tests/java_api/RSUnitTests/RSUnitTests.py b/tests/java_api/RSUnitTests/RSUnitTests.py index d94ffec6..ea3b6902 100644 --- a/tests/java_api/RSUnitTests/RSUnitTests.py +++ b/tests/java_api/RSUnitTests/RSUnitTests.py @@ -131,6 +131,7 @@ UNIT_TEST_PLATFORM_VERSIONS = { # Only affects forward compatibility tests. # Useful for Slang regression fixes. UNIT_TEST_TOOLS_VERSIONS = { + 'small_struct': 26, 'reflection3264': 26, } |