Merge "Extractors: Enable building static libraries for all extractors"

am: 0bc430a19a Change-Id: I4dddab5bccee791c9d5a2c7e014723bf78078f93
5 years ago · 1bd0d9ec00
parent d224afe849 0bc430a19a
commit 1bd0d9ec00
10 changed files with 10 additions and 10 deletions
--- a/media/extractors/aac/Android.bp
+++ b/media/extractors/aac/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["AACExtractor.cpp"],

--- a/media/extractors/amr/Android.bp
+++ b/media/extractors/amr/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["AMRExtractor.cpp"],

--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["FLACExtractor.cpp"],

--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["MidiExtractor.cpp"],

--- a/media/extractors/mkv/Android.bp
+++ b/media/extractors/mkv/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["MatroskaExtractor.cpp"],

--- a/media/extractors/mp3/Android.bp
+++ b/media/extractors/mp3/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: [
            "MP3Extractor.cpp",
--- 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",
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: [
        "ExtractorBundle.cpp",
--- a/media/extractors/ogg/Android.bp
+++ b/media/extractors/ogg/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["OggExtractor.cpp"],

--- a/media/extractors/wav/Android.bp
+++ b/media/extractors/wav/Android.bp
@ -1,4 +1,4 @@
-cc_library_shared {
+cc_library {

    srcs: ["WAVExtractor.cpp"],