diff options
author | Arthur Eubanks <aeubanks@google.com> | 2017-06-07 00:25:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-07 00:25:09 +0000 |
commit | 993abbf43cfce45cfcca56a4b49a2d8a0f7052fa (patch) | |
tree | 2b7f411f91654915aa9a5edc5b4523163cc1dc18 | |
parent | 25fb0a9c6812ea861dc531437d28d9a1ba5f90e4 (diff) | |
parent | e053434a15f5f7ddd8870fcc9744bc91c57acb52 (diff) | |
download | rs-993abbf43cfce45cfcca56a4b49a2d8a0f7052fa.tar.gz |
Merge "Revert "Fix math.rs"" am: 4205ce7fcc
am: e053434a15
Change-Id: Ieef274be260bd76e63e805d0f8d9a2c098cfbb47
-rw-r--r-- | tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs | 1 | ||||
-rw-r--r-- | tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs index 676423c9..2e534810 100644 --- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs +++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs @@ -301,7 +301,6 @@ static bool test_fp_math(uint32_t index) { TEST_FN_FUNC_FN_F(fmin); TEST_FN_FUNC_FN_FN(fmod); TEST_FN_FUNC_FN_PFN(fract); - TEST_FN_FUNC_FN(fract); TEST_FN_FUNC_FN_PIN(frexp); TEST_FN_FUNC_FN_FN(hypot); TEST_IN_FUNC_FN(ilogb); diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs index 1d2682e5..895ddc65 100644 --- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs +++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs @@ -303,7 +303,6 @@ static bool test_fp_math(uint32_t index) { TEST_FN_FUNC_FN_F(fmin); TEST_FN_FUNC_FN_FN(fmod); TEST_FN_FUNC_FN_PFN(fract); - TEST_FN_FUNC_FN(fract); TEST_FN_FUNC_FN_PIN(frexp); TEST_FN_FUNC_FN_FN(hypot); TEST_IN_FUNC_FN(ilogb); |