Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2acd7445 authored by Chong Zhang's avatar Chong Zhang
Browse files

extractor Android.bp cleanup 

use defaults for all extractor libs to make versioning easier.

bug: 147759770
test: build

Change-Id: I930329bbaba600827534113fd918040c4fcb60c4
parent 5b8039a6

media/extractors/Android.bp

0 → 100644
+52 −0
Original line number Diff line number Diff line 
// Copyright (C) 2020 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//     http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



cc_defaults {

    name: "extractor-defaults_no-sanitizer",



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

    ],



    shared_libs: [

        "liblog",

        "libmediandk#29",

    ],



    relative_install_path: "extractors",



    compile_multilib: "first",



    cflags: [

        "-Werror",

        "-Wall",

        "-fvisibility=hidden",

    ],



    version_script: "exports.lds",

}



cc_defaults {

    name: "extractor-defaults",



    defaults: ["extractor-defaults_no-sanitizer"],



    sanitize: {

        cfi: true,

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },

}
 
 No newline at end of file

media/extractors/aac/Android.bp

+2 −29
Original line number Diff line number Diff line 
cc_library {

    name: "libaacextractor",

    defaults: ["extractor-defaults"],



    srcs: ["AACExtractor.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/",

    ],



    shared_libs: [

        "liblog",

        "libmediandk",

    ],



    static_libs: [

        "libstagefright_foundation",

        "libstagefright_metadatautils",

        "libutils",

    ],



    name: "libaacextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",



    cflags: [

        "-Werror",

        "-Wall",

        "-fvisibility=hidden",

    ],

    version_script: "exports.lds",



    sanitize: {

        cfi: true,

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },



}

media/extractors/amr/Android.bp

+2 −29
Original line number Diff line number Diff line 
cc_library {

    name: "libamrextractor",

    defaults: ["extractor-defaults"],



    srcs: ["AMRExtractor.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

    ],



    shared_libs: [

        "liblog",

        "libmediandk",

    ],



    static_libs: [

        "libstagefright_foundation",

    ],



    name: "libamrextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",



    cflags: [

        "-Werror",

        "-Wall",

        "-fvisibility=hidden",

    ],

    version_script: "exports.lds",



    sanitize: {

        cfi: true,

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },



}

media/extractors/flac/Android.bp

+2 −23
Original line number Diff line number Diff line 
cc_library {

    name: "libflacextractor",

    defaults: ["extractor-defaults"],



    srcs: ["FLACExtractor.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

        "external/flac/include",

    ],



    shared_libs: [

        "libbinder_ndk",

        "liblog",

        "libmediandk",

    ],



    static_libs: [
@@ -21,24 +20,4 @@ cc_library { 
        "libutils",

    ],



    name: "libflacextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",



    cflags: [

        "-Werror",

        "-Wall",

        "-fvisibility=hidden",

    ],

    version_script: "exports.lds",



    sanitize: {

        cfi: true,

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },



}

media/extractors/midi/Android.bp

+2 −27
Original line number Diff line number Diff line 
cc_library {

    name: "libmidiextractor",

    defaults: ["extractor-defaults"],



    srcs: ["MidiExtractor.cpp"],



    include_dirs: [

        "frameworks/av/media/libstagefright/include",

    ],



    header_libs: [

        "libmedia_headers",

    ],



    shared_libs: [

        "liblog",

        "libmediandk",

    ],



    static_libs: [

        "libmedia_midiiowrapper",

        "libsonivox",

        "libstagefright_foundation"

    ],

    name: "libmidiextractor",

    relative_install_path: "extractors",



    compile_multilib: "first",



    cflags: [

        "-Werror",

        "-Wall",

        "-fvisibility=hidden",

    ],

    version_script: "exports.lds",



    sanitize: {

        cfi: true,

        misc_undefined: [

            "unsigned-integer-overflow",

            "signed-integer-overflow",

        ],

    },



}