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

Commit dda7686e authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Minor build-outside-android fixes" into main am: 43571dd2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2852823



Change-Id: Ice621b659958a721d3650b5bd8a1ef538447ccb2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78825b66 43571dd2

libs/binder/Android.bp

+12 −9
Original line number Diff line number Diff line
@@ -106,6 +106,17 @@ cc_defaults { 
    header_libs: [

        "libbinder_headers",

    ],



    cflags: [

        "-Wextra",

        "-Wextra-semi",

        "-Werror",

        "-Wzero-as-null-pointer-constant",

        "-Wreorder-init-list",

        "-Wunused-const-variable",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

    ],

}



cc_defaults {
@@ -135,15 +146,6 @@ cc_defaults { 
        export_aidl_headers: true,

    },



    cflags: [

        "-Wextra",

        "-Wextra-semi",

        "-Werror",

        "-Wzero-as-null-pointer-constant",

        "-Wreorder-init-list",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

    ],

    product_variables: {

        debuggable: {

            cflags: [
@@ -220,6 +222,7 @@ cc_defaults { 


    cflags: [

        "-DBINDER_RPC_SINGLE_THREADED",

        "-DBINDER_ENABLE_LIBLOG_ASSERT",

        // Trusty libbinder uses vendor stability for its binders

        "-D__ANDROID_VNDK__",

        "-U__ANDROID__",

libs/binder/Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static std::atomic<size_t> gParcelGlobalAllocSize; 
constexpr size_t kMaxFds = 1024;



// Maximum size of a blob to transfer in-place.

static const size_t BLOB_INPLACE_LIMIT = 16 * 1024;

[[maybe_unused]] static const size_t BLOB_INPLACE_LIMIT = 16 * 1024;



enum {

    BLOB_INPLACE = 0,

libs/binder/file.cpp

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 


#ifdef BINDER_NO_LIBBASE



#include "Utils.h"



#include <stdint.h>



// clang-format off

libs/binder/include/binder/Delegate.h

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ 


#include <binder/IBinder.h>



#if !defined(__BIONIC__) && defined(BINDER_ENABLE_LIBLOG_ASSERT)

#include <log/log.h>

#define __assert(file, line, message) LOG_ALWAYS_FATAL(file ":" #line ": " message)

#endif



#ifndef __BIONIC__

#ifndef __assert

libs/binder/ndk/include_ndk/android/binder_status.h

+5 −0
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
#include <stdint.h>

#include <sys/cdefs.h>



#if !defined(__BIONIC__) && defined(BINDER_ENABLE_LIBLOG_ASSERT)

#include <log/log.h>

#define __assert(file, line, message) LOG_ALWAYS_FATAL(file ":" #line ": " message)

#endif



__BEGIN_DECLS



#ifndef __BIONIC__