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

Commit 5b85b973 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix binder_sdk build" into main am: 04b36156 am: b6f27d42 

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



Change-Id: I40379f5271c18cc293570655e3f19590315a2eac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0973a492 b6f27d42

libs/binder/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ cc_cmake_snapshot { 
    prebuilts: [

        // to enable arm64 host support, build with musl - e.g. on aosp_cf_arm64_phone

        "aidl",

        "libc++",

    ],

    include_sources: true,

    cflags: [

libs/binder/include/binder/Functional.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ public: 
    inline void release() { f_.reset(); }



private:

    friend scope_guard<F> android::binder::impl::make_scope_guard(F);

    friend scope_guard<F> android::binder::impl::make_scope_guard<>(F);



    inline scope_guard(F&& f) : f_(std::move(f)) {}

libs/binder/include/binder/ProcessState.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include <atomic>

#include <chrono>

#include <condition_variable>

#include <mutex>



// ---------------------------------------------------------------------------

libs/binder/tests/binder_sdk/binder_sdk_docker_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ else 
        exit 1

    fi

    ${ANDROID_BUILD_TOP}/build/soong/soong_ui.bash --make-mode binder_sdk

    BINDER_SDK_ZIP="${ANDROID_BUILD_TOP}/out/soong/.intermediates/frameworks/native/libs/binder/binder_sdk/linux_glibc_x86_64/*/binder_sdk.zip"

    BINDER_SDK_ZIP="${ANDROID_BUILD_TOP}/out/soong/.intermediates/frameworks/native/libs/binder/binder_sdk/linux_glibc_x86_64/binder_sdk.zip"

    DOCKER_PATH="$(dirname $(ls -1 ${BINDER_SDK_ZIP} | head --lines=1))"

fi