From be7e57f8a3b0d78021622bd3e405f98e60d3e138 Mon Sep 17 00:00:00 2001 From: Manisha Jajoo Date: Fri, 22 Nov 2019 10:18:54 +0530 Subject: [PATCH] Extractors: Enable building static libraries for all extractors Current make files builds only shared libraries for extractors Enable building static libraries for MediaTesting Test: builds Bug: 144965408 Change-Id: I4f05cfed60ac19b21aaeab396895b7b94eedee12 --- media/extractors/aac/Android.bp | 2 +- media/extractors/amr/Android.bp | 2 +- media/extractors/flac/Android.bp | 2 +- media/extractors/midi/Android.bp | 2 +- media/extractors/mkv/Android.bp | 2 +- media/extractors/mp3/Android.bp | 2 +- media/extractors/mp4/Android.bp | 2 +- media/extractors/mpeg2/Android.bp | 2 +- media/extractors/ogg/Android.bp | 2 +- media/extractors/wav/Android.bp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media/extractors/aac/Android.bp b/media/extractors/aac/Android.bp index a58167a655..53b394fe06 100644 --- a/media/extractors/aac/Android.bp +++ b/media/extractors/aac/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["AACExtractor.cpp"], diff --git a/media/extractors/amr/Android.bp b/media/extractors/amr/Android.bp index 4bd933deb5..cd76062f1e 100644 --- a/media/extractors/amr/Android.bp +++ b/media/extractors/amr/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["AMRExtractor.cpp"], diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp index 3a3d051b70..c669b341cc 100644 --- a/media/extractors/flac/Android.bp +++ b/media/extractors/flac/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["FLACExtractor.cpp"], diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp index d36cb49ba1..40c91e76be 100644 --- a/media/extractors/midi/Android.bp +++ b/media/extractors/midi/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["MidiExtractor.cpp"], diff --git a/media/extractors/mkv/Android.bp b/media/extractors/mkv/Android.bp index 1744d3d63f..650d79d2ff 100644 --- a/media/extractors/mkv/Android.bp +++ b/media/extractors/mkv/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["MatroskaExtractor.cpp"], diff --git a/media/extractors/mp3/Android.bp b/media/extractors/mp3/Android.bp index 4e2f2480ac..6f02b0f8d9 100644 --- a/media/extractors/mp3/Android.bp +++ b/media/extractors/mp3/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: [ "MP3Extractor.cpp", diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp index 1b308aa7ef..d9f11fc8eb 100644 --- a/media/extractors/mp4/Android.bp +++ b/media/extractors/mp4/Android.bp @@ -35,7 +35,7 @@ cc_defaults { compile_multilib: "first", } -cc_library_shared { +cc_library { name: "libmp4extractor", diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp index 1d9e1e65da..14bd644309 100644 --- a/media/extractors/mpeg2/Android.bp +++ b/media/extractors/mpeg2/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: [ "ExtractorBundle.cpp", diff --git a/media/extractors/ogg/Android.bp b/media/extractors/ogg/Android.bp index 604ec5945e..e661b5dc18 100644 --- a/media/extractors/ogg/Android.bp +++ b/media/extractors/ogg/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["OggExtractor.cpp"], diff --git a/media/extractors/wav/Android.bp b/media/extractors/wav/Android.bp index 7e89271e45..51e3c31b6f 100644 --- a/media/extractors/wav/Android.bp +++ b/media/extractors/wav/Android.bp @@ -1,4 +1,4 @@ -cc_library_shared { +cc_library { srcs: ["WAVExtractor.cpp"],