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

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

Merge changes from topic "protobuf-3.9.1" am: 2e928fb6 

am: 89ee99a0

Change-Id: Ibbd3573012345c37a8f52b9826337c094e18aa8b
parents 6b1de174 89ee99a0

cmds/statsd/Android.bp

+12 −4
Original line number Diff line number Diff line
@@ -207,6 +207,10 @@ 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",
@@ -268,11 +272,11 @@ cc_test { 
    ],



    proto: {

        type: "full",

        type: "lite",

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

    },



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

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



}
@@ -285,6 +289,10 @@ 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",
@@ -299,7 +307,7 @@ cc_benchmark { 
    ],



    proto: {

        type: "full",

        type: "lite",

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

    },
@@ -321,7 +329,7 @@ cc_benchmark { 
    shared_libs: [

        "libgtest_prod",

        "libstatslog",

        "libprotobuf-cpp-full",

        "libprotobuf-cpp-lite",

    ],

}