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

Commit eb7d8f46 authored by Tej Singh's avatar Tej Singh
Browse files

Make libstatssocket shared 

Also make private versions of the libraries available to link statically
for tests. We should try to figure out a better long term solution.

Test: m
Test: bit statsd_test:*
Test: atest LibStatsPullTests
Test: bit libstatssocket_test:*
Test: atest GtsStatsdHostTestCases
Bug: 149340100

Change-Id: I05b91efab2a657aec75d436575aff4373f86ed3f
parent ee47af62

apex/statsd/aidl/Android.bp

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

    backend: {

        java: {

            enabled: false, // the platform uses statsd_java_aidl

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

        },

        cpp: {

            enabled: false,

apex/statsd/tests/libstatspull/Android.bp

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

    ],

    shared_libs: [

        "libbinder",

        "libbinder_ndk",

        "statsd-aidl-ndk_platform",

    ],

    static_libs: [

        "libstatspull_private",

        "libstatssocket_private",

        "libutils",

        "libstatspull",

        "libstatssocket",

        "libcutils",

    ],

}

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

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

 */



#include <binder/ProcessState.h>

#include <android/binder_process.h>

#include <jni.h>

#include <log/log.h>

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



using std::this_thread::sleep_for;

using namespace android;



namespace {

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

        initialized = true;

        // Set up the binder

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

        ps->setThreadPoolMaxThreadCount(9);

        ps->startThreadPool();

        ps->giveThreadPoolName();

        ABinderProcess_setThreadPoolMaxThreadCount(9);

        ABinderProcess_startThreadPool();

    }

}

cmds/statsd/Android.bp

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

        "libgmock",

        "libplatformprotos",



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

        // moved to the apex.

        "libstatssocket",

        "libcutils",

        "libstatssocket_private",

    ],



    proto: {

tools/stats_log_api_gen/Android.bp

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

        "liblog",

        "libcutils",

        "libstatssocket",

    ],

    apex_available: [

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

        "test_com.android.os.statsd",

    ],

    target: {

        android: {

            shared_libs: ["libstatssocket"],

        },

        host: {

            static_libs: ["libstatssocket"],

        },

    },

}