diff options
| author | Chih-Yu Huang <akahuang@google.com> | 2020-04-21 12:24:04 +0900 |
|---|---|---|
| committer | Chih-Yu Huang <akahuang@google.com> | 2020-04-23 12:47:53 +0900 |
| commit | aed1f934169b868fd73eb642bfe285cfed5b23a1 (patch) | |
| tree | fd9789ed5234fbc1f72b36a2058b01a6f0bdf8f7 /tests | |
| parent | cac74e386a7572bcc34b04f21ca7a66ecf36cd57 (diff) | |
| download | v4l2_codec2-aed1f934169b868fd73eb642bfe285cfed5b23a1.tar.gz | |
c2_e2e_test: remove __dso_handle.
Seems the __dso_handle issue is resolved at R branch. Instead, keeping
__dso_handle causes compilation error.
This CL removes the workaround to fix the compilation.
Bug: 146030443
Test: mmm external/v4l2_codec2/tests/c2_e2e_test
Change-Id: Id7364c6bced6d4a6f7cc22b9b3f3b8869a859910
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/c2_e2e_test/jni/e2e_test_jni.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/c2_e2e_test/jni/e2e_test_jni.cpp b/tests/c2_e2e_test/jni/e2e_test_jni.cpp index 495128c..9535fe7 100644 --- a/tests/c2_e2e_test/jni/e2e_test_jni.cpp +++ b/tests/c2_e2e_test/jni/e2e_test_jni.cpp @@ -106,10 +106,4 @@ JNIEXPORT void JNICALL Java_org_chromium_c2_test_E2eTestActivity_stopDecoderLoop reinterpret_cast<android::MediaCodecDecoder*>(decoderPtr)->StopLooping(); } -// Gtest only provides a static library, but the build system doesn't like including -// that in a shared library. In particular, __dso_handle is not exposed for shared -// libraries, but static libraries expect to find it. Manually providing the symbol -// can cause some problems with global destructors, but that doesn't currently cause -// problems for us. This approach should *not* be copied to other places. -void* __dso_handle; } |