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

Commit bd7c4efb authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80 

am: 65200cf7

Change-Id: I952a9cbcb9bf9d2d479efecc28c5411e31dc9cf6
parents 94107f2f 65200cf7

cmds/statsd/Android.bp

+4 −12
Original line number Diff line number Diff line
@@ -196,10 +196,6 @@ cc_test { 
    ],



    srcs: [

        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",



        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/stats_log.proto",
@@ -249,11 +245,11 @@ cc_test { 
    static_libs: ["libgmock"],



    proto: {

        type: "lite",

        type: "full",

        include_dirs: ["external/protobuf/src"],

    },



    shared_libs: ["libprotobuf-cpp-lite"],

    shared_libs: ["libprotobuf-cpp-full"],



}
@@ -266,10 +262,6 @@ cc_benchmark { 
    defaults: ["statsd_defaults"],



    srcs: [

        // atom_field_options.proto needs field_options.proto, but that is

        // not included in libprotobuf-cpp-lite, so compile it here.

        ":libprotobuf-internal-protos",



        "src/atom_field_options.proto",

        "src/atoms.proto",

        "src/stats_log.proto",
@@ -284,7 +276,7 @@ cc_benchmark { 
    ],



    proto: {

        type: "lite",

        type: "full",

        include_dirs: ["external/protobuf/src"],

    },
@@ -302,7 +294,7 @@ cc_benchmark { 
    shared_libs: [

        "libgtest_prod",

        "libstatslog",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-full",

    ],

}