commit 4c54206574ce914152a5cad4f2c26101ce3bc051
author Chong Zhang <chz@google.com> Tue Dec 08 16:38:09 2020 -0800
committer Chong Zhang <chz@google.com> Tue Dec 08 16:40:35 2020 -0800
tree 1c6a1e0146e8a8fe62f6039970e748f4d3ef937d
parent f4e0a07dfc6fd095fea7b34e08a137379741115b

transcoding: statically link libmediatranscoding.so in tests

Otherwise test doesn't work after service moved to apex.

bug: 173627260
bug: 159172726
test:
With local changes to move service to apex,
atest TranscodingSessionController_tests
Should not see link error in test.

Change-Id: I4729cb5ee1635a8143fb803b22a20e3c59ce378c

media/libmediatranscoding/Android.bp

diff --git a/media/libmediatranscoding/Android.bp b/media/libmediatranscoding/Android.bp
index 735afc2..1934820 100644
--- a/media/libmediatranscoding/Android.bp
+++ b/media/libmediatranscoding/Android.bp
@@ -48,7 +48,7 @@
     },
 }
 
-cc_library_shared {
+cc_library {
     name: "libmediatranscoding",
 
     srcs: [

media/libmediatranscoding/tests/Android.bp

diff --git a/media/libmediatranscoding/tests/Android.bp b/media/libmediatranscoding/tests/Android.bp
index e49df35..8bff10a 100644
--- a/media/libmediatranscoding/tests/Android.bp
+++ b/media/libmediatranscoding/tests/Android.bp
@@ -14,15 +14,16 @@
     ],
 
     shared_libs: [
+        "libandroid",
         "libbinder_ndk",
         "libcutils",
         "liblog",
         "libutils",
-        "libmediatranscoding"
     ],
 
     static_libs: [
         "mediatranscoding_aidl_interface-ndk_platform",
+        "libmediatranscoding",
     ],
 
     cflags: [