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

Commit f0e543ac authored by Manisha Jajoo's avatar Manisha Jajoo Committed by android-build-merger
Browse files

Merge "Benchmark: Change library names to begin with libmediabenchmark" am:... 

Merge "Benchmark: Change library names to begin with libmediabenchmark" am: e4f759b5 am: 8c20df69
am: ddb41dac

Change-Id: I32570b8dcf42aa92ec810f52de463e0f0e65776a
parents ff7eab2a ddb41dac

media/tests/benchmark/src/native/common/Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
 */



cc_library_static {

    name: "libbenchmark_common",

    name: "libmediabenchmark_common",

    defaults: [

        "libbenchmark-defaults",

        "libbenchmark_soft_sanitize_all-defaults",

        "libmediabenchmark-defaults",

        "libmediabenchmark_soft_sanitize_all-defaults",

    ],



    srcs: [
@@ -32,19 +32,19 @@ cc_library_static { 
}



cc_defaults {

    name: "libbenchmark_common-defaults",

    name: "libmediabenchmark_common-defaults",



    defaults: [

        "libbenchmark-defaults",

        "libmediabenchmark-defaults",

    ],



    static_libs: [

        "libbenchmark_common",

        "libmediabenchmark_common",

    ],

}



cc_defaults {

    name: "libbenchmark-defaults",

    name: "libmediabenchmark-defaults",



    shared_libs: [

        "libmediandk",
@@ -61,7 +61,7 @@ cc_defaults { 
// public dependency for native implementation

// to be used by code under media/benchmark/* only

cc_defaults {

    name: "libbenchmark_soft_sanitize_all-defaults",

    name: "libmediabenchmark_soft_sanitize_all-defaults",



    sanitize: {

        misc_undefined: [

media/tests/benchmark/src/native/decoder/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
 */



cc_library_static {

    name: "libbenchmark_decoder",

    name: "libmediabenchmark_decoder",

    defaults: [

        "libbenchmark_common-defaults",

        "libbenchmark_soft_sanitize_all-defaults",

        "libmediabenchmark_common-defaults",

        "libmediabenchmark_soft_sanitize_all-defaults",

    ],



    srcs: ["Decoder.cpp"],



    static_libs: ["libbenchmark_extractor"],

    static_libs: ["libmediabenchmark_extractor"],



    export_include_dirs: ["."],

media/tests/benchmark/src/native/encoder/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 
 */



cc_library_static {

    name: "libbenchmark_encoder",

    name: "libmediabenchmark_encoder",

    defaults: [

        "libbenchmark_common-defaults",

        "libbenchmark_soft_sanitize_all-defaults",

        "libmediabenchmark_common-defaults",

        "libmediabenchmark_soft_sanitize_all-defaults",

    ],



    srcs: ["Encoder.cpp"],



    static_libs: ["libbenchmark_extractor",

                  "libbenchmark_decoder",

    static_libs: ["libmediabenchmark_extractor",

                  "libmediabenchmark_decoder",

    ],



    export_include_dirs: ["."],

media/tests/benchmark/src/native/extractor/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
 */



cc_library_static {

    name: "libbenchmark_extractor",

    name: "libmediabenchmark_extractor",

    defaults: [

        "libbenchmark_common-defaults",

        "libbenchmark_soft_sanitize_all-defaults",

        "libmediabenchmark_common-defaults",

        "libmediabenchmark_soft_sanitize_all-defaults",

    ],



    srcs: ["Extractor.cpp"],

media/tests/benchmark/src/native/muxer/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
 */



cc_library_static {

    name: "libbenchmark_muxer",

    name: "libmediabenchmark_muxer",

    defaults: [

        "libbenchmark_common-defaults",

        "libbenchmark_soft_sanitize_all-defaults",

        "libmediabenchmark_common-defaults",

        "libmediabenchmark_soft_sanitize_all-defaults",

    ],



    srcs: ["Muxer.cpp"],



    static_libs: ["libbenchmark_extractor"],

    static_libs: ["libmediabenchmark_extractor"],



    export_include_dirs: ["."],