libmediatranscoder: Android.bp updates
- Build libmediatranscoder as both shared and static libraries
- Use libmediatranscoder static library in unit tests
- Disable address sanitizer in tests
- Do not use address sanitizer enabled library in tests
Instead of enabling address sanitizer in Android.bp, better approach
is to test on devices flashed with hwasan images where all modules
are built with hwaddress sanitizer.
Bug: 173627260
Test: atest MediaTrackTranscoderTests
Change-Id: Id06ce520012485579c2be60348a2b38637fa7327
diff --git a/media/libmediatranscoding/transcoder/Android.bp b/media/libmediatranscoding/transcoder/Android.bp
index 1896412..aa7cdde 100644
--- a/media/libmediatranscoding/transcoder/Android.bp
+++ b/media/libmediatranscoding/transcoder/Android.bp
@@ -60,16 +60,8 @@
},
}
-cc_library_shared {
+cc_library {
name: "libmediatranscoder",
defaults: ["mediatranscoder_defaults"],
}
-cc_library_shared {
- name: "libmediatranscoder_asan",
- defaults: ["mediatranscoder_defaults"],
-
- sanitize: {
- address: true,
- },
-}
diff --git a/media/libmediatranscoding/transcoder/tests/Android.bp b/media/libmediatranscoding/transcoder/tests/Android.bp
index 2fec74c..21e4221 100644
--- a/media/libmediatranscoding/transcoder/tests/Android.bp
+++ b/media/libmediatranscoding/transcoder/tests/Android.bp
@@ -7,11 +7,14 @@
"libmedia_headers",
],
+ static_libs: [
+ "libmediatranscoder",
+ ],
shared_libs: [
"libbase",
"libcutils",
"libmediandk",
- "libmediatranscoder_asan",
+ "libnativewindow",
"libutils",
],
@@ -26,7 +29,6 @@
"signed-integer-overflow",
],
cfi: true,
- address: true,
},
data: [":test_assets"],