diff options
| author | 2023-11-30 23:41:50 +0000 | |
|---|---|---|
| committer | 2023-11-30 23:41:50 +0000 | |
| commit | dbca8bd0490750c9c786485dddf9901584a112b6 (patch) | |
| tree | 787f42d4ebaaf46586f686bfccf7f6e817eacc08 | |
| parent | f1e9f2e2a4269936dde8ea925df2b0ee90c3a040 (diff) | |
| parent | 88f1c1119e89988edf6bae03e71eb9cd9a012ea0 (diff) | |
Merge "ultrahdr: Updates to unit tests" into main am: 88f1c1119e
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2854563
Change-Id: I69c5a08c381dde9cc8f51342a0a5bf3101c8408e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/ultrahdr/tests/Android.bp | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/libs/ultrahdr/tests/Android.bp b/libs/ultrahdr/tests/Android.bp index 594413018c..bda804ae31 100644 --- a/libs/ultrahdr/tests/Android.bp +++ b/libs/ultrahdr/tests/Android.bp @@ -22,12 +22,14 @@ package { } cc_test { - name: "libultrahdr_test", + name: "ultrahdr_unit_test", test_suites: ["device-tests"], srcs: [ "gainmapmath_test.cpp", "icchelper_test.cpp", "jpegr_test.cpp", + "jpegencoderhelper_test.cpp", + "jpegdecoderhelper_test.cpp", ], shared_libs: [ "libimage_io", @@ -42,38 +44,7 @@ cc_test { "libultrahdr", "libutils", ], -} - -cc_test { - name: "libjpegencoderhelper_test", - test_suites: ["device-tests"], - srcs: [ - "jpegencoderhelper_test.cpp", - ], - shared_libs: [ - "libjpeg", - "liblog", - ], - static_libs: [ - "libgtest", - "libjpegencoder", - ], -} - -cc_test { - name: "libjpegdecoderhelper_test", - test_suites: ["device-tests"], - srcs: [ - "jpegdecoderhelper_test.cpp", - ], - shared_libs: [ - "libjpeg", - "liblog", - ], - static_libs: [ - "libgtest", - "libjpegdecoder", - "libultrahdr", - "libutils", + data: [ + "./data/*.*", ], } |