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

Commit 36a845de authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make libstatssocket shared" into rvc-dev

parents a57109b6 eb7d8f46

apex/statsd/aidl/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ aidl_interface { 
    ],

    ],

    backend: {

    backend: {

        java: {

        java: {

            enabled: false, // the platform uses statsd_java_aidl

            enabled: false, // framework-statsd and service-statsd use framework-statsd-aidl-sources

        },

        },

        cpp: {

        cpp: {

            enabled: false,

            enabled: false,

apex/statsd/tests/libstatspull/Android.bp

+8 −4
Original line number Original line Diff line number Diff line
@@ -48,9 +48,13 @@ cc_library_shared { 
        "-Werror",

        "-Werror",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "statsd-aidl-ndk_platform",

    ],

    static_libs: [

        "libstatspull_private",

        "libstatssocket_private",

        "libutils",

        "libutils",

        "libstatspull",

        "libcutils",

        "libstatssocket",

    ],

    ],

}
 
}

apex/statsd/tests/libstatspull/jni/stats_pull_helper.cpp

+3 −6
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 * limitations under the License.

 */

 */





#include <binder/ProcessState.h>

#include <android/binder_process.h>

#include <jni.h>

#include <jni.h>

#include <log/log.h>

#include <log/log.h>

#include <stats_event.h>

#include <stats_event.h>
@@ -24,7 +24,6 @@ 
#include <thread>

#include <thread>





using std::this_thread::sleep_for;

using std::this_thread::sleep_for;

using namespace android;





namespace {

namespace {

static int32_t sAtomTag;

static int32_t sAtomTag;
@@ -39,10 +38,8 @@ static void init() { 
    if (!initialized) {

    if (!initialized) {

        initialized = true;

        initialized = true;

        // Set up the binder

        // Set up the binder

        sp<ProcessState> ps(ProcessState::self());

        ABinderProcess_setThreadPoolMaxThreadCount(9);

        ps->setThreadPoolMaxThreadCount(9);

        ABinderProcess_startThreadPool();

        ps->startThreadPool();

        ps->giveThreadPoolName();

    }

    }

}

}

cmds/statsd/Android.bp

+1 −5
Original line number Original line Diff line number Diff line
@@ -302,11 +302,7 @@ cc_test { 
    static_libs: [

    static_libs: [

        "libgmock",

        "libgmock",

        "libplatformprotos",

        "libplatformprotos",



        "libstatssocket_private",

        // TODO(b/149842105): Make libstatssocket shared and remove libcutils once statsd_test is

        // moved to the apex.

        "libstatssocket",

        "libcutils",

    ],

    ],





    proto: {

    proto: {

tools/stats_log_api_gen/Android.bp

+8 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,6 @@ cc_library { 
    shared_libs: [

    shared_libs: [

        "liblog",

        "liblog",

        "libcutils",

        "libcutils",

        "libstatssocket",

    ],

    ],

    apex_available: [

    apex_available: [

        "//apex_available:platform",

        "//apex_available:platform",
@@ -129,5 +128,13 @@ cc_library { 
        "com.android.os.statsd",

        "com.android.os.statsd",

        "test_com.android.os.statsd",

        "test_com.android.os.statsd",

    ],

    ],

    target: {

        android: {

            shared_libs: ["libstatssocket"],

        },

        host: {

            static_libs: ["libstatssocket"],

        },

    },

}

}