Fix binder_sdk build
Also, drop no longer necessary explicit libc++ prebuilt.
Bug: 285204695
Test: atest --host binder_sdk_test
Change-Id: I98dd792e379ff19f935108f17b47f26dd20042b3
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 1abde5c..87026bb 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -100,7 +100,6 @@
prebuilts: [
// to enable arm64 host support, build with musl - e.g. on aosp_cf_arm64_phone
"aidl",
- "libc++",
],
include_sources: true,
cflags: [
diff --git a/libs/binder/include/binder/Functional.h b/libs/binder/include/binder/Functional.h
index bb0e5f4..e153969 100644
--- a/libs/binder/include/binder/Functional.h
+++ b/libs/binder/include/binder/Functional.h
@@ -36,7 +36,7 @@
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)) {}
diff --git a/libs/binder/include/binder/ProcessState.h b/libs/binder/include/binder/ProcessState.h
index 8908cb8..021bd58 100644
--- a/libs/binder/include/binder/ProcessState.h
+++ b/libs/binder/include/binder/ProcessState.h
@@ -25,6 +25,7 @@
#include <atomic>
#include <chrono>
+#include <condition_variable>
#include <mutex>
// ---------------------------------------------------------------------------
diff --git a/libs/binder/tests/binder_sdk/binder_sdk_docker_test.sh b/libs/binder/tests/binder_sdk/binder_sdk_docker_test.sh
index 0eca846..9ea8cb3 100755
--- a/libs/binder/tests/binder_sdk/binder_sdk_docker_test.sh
+++ b/libs/binder/tests/binder_sdk/binder_sdk_docker_test.sh
@@ -57,7 +57,7 @@
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