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

Commit 2918d7eb authored by Vick Wang's avatar Vick Wang Committed by Automerger Merge Worker
Browse files

Merge "Suppress ThreadNetwork HAL debug log on user build" into main am: 1d4c1194 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3248352



Change-Id: Ib8940d8f4a18b433c3d808b204cd6b07d9ec25aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43c4ec0f 1d4c1194

threadnetwork/aidl/default/Android.bp

+13 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ cc_binary { 
    vendor: true,

    relative_install_path: "hw",



    defaults: ["android.hardware.threadnetwork-service.defaults"],



    shared_libs: [

        "libbinder_ndk",

        "liblog",
@@ -43,6 +45,17 @@ cc_binary { 
    ],

}



cc_defaults {

    name: "android.hardware.threadnetwork-service.defaults",

    product_variables: {

        debuggable: {

            cppflags: [

                "-DDEV_BUILD",

            ],

        },

    },

}



cc_fuzz {

    name: "android.hardware.threadnetwork-service.fuzzer",

threadnetwork/aidl/default/utils.cpp

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ void otLogCritPlat(const char* format, ...) { 
}



void otDumpDebgPlat(const char* aText, const void* aData, uint16_t aDataLength) {

#ifdef DEV_BUILD

    constexpr uint16_t kBufSize = 512;

    char buf[kBufSize];
@@ -55,6 +56,11 @@ void otDumpDebgPlat(const char* aText, const void* aData, uint16_t aDataLength) 


        __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s: %s", aText, buf);

    }

#else

    OT_UNUSED_VARIABLE(aText);

    OT_UNUSED_VARIABLE(aData);

    OT_UNUSED_VARIABLE(aDataLength);

#endif

}



OT_TOOL_WEAK void otPlatAlarmMilliFired(otInstance* aInstance) {