From de3a2bc7a0b884ca24d9fa8d33d3971c3bd19031 Mon Sep 17 00:00:00 2001 From: Brett Chabot Date: Wed, 4 Nov 2020 08:59:06 -0800 Subject: [PATCH] Disable cursorwindow_fuzzer mac build. Its libbinder dependency is not supported on mac. Bug: 172023026 Test: m -j libandroidfw_fuzzer_lib cursorwindow_fuzzer Change-Id: I94c23c7952db7dd278f24ccb239d63f3c76e7a8e --- libs/androidfw/Android.bp | 25 ++++++++++++++++--- .../fuzz/cursorwindow_fuzzer/Android.bp | 4 +++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index 903ca2aa07836..a3fcf90b2d468 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -160,10 +160,17 @@ cc_test { "tests/ObbFile_test.cpp", "tests/PosixUtils_test.cpp", ], - shared_libs: common_test_libs + ["libbinder", "liblog", "libui"], + shared_libs: common_test_libs + [ + "libbinder", + "liblog", + "libui", + ], }, host: { - static_libs: common_test_libs + ["liblog", "libz"], + static_libs: common_test_libs + [ + "liblog", + "libz", + ], }, }, data: [ @@ -204,10 +211,20 @@ cc_library { export_include_dirs: ["include"], target: { android: { - shared_libs: common_test_libs + ["libbinder", "liblog"], + shared_libs: common_test_libs + [ + "libbinder", + "liblog", + ], }, host: { - static_libs: common_test_libs + ["libbinder", "liblog"], + static_libs: common_test_libs + [ + "libbinder", + "liblog", + ], + }, + darwin: { + // libbinder is not supported on mac + enabled: false, }, }, } diff --git a/libs/androidfw/fuzz/cursorwindow_fuzzer/Android.bp b/libs/androidfw/fuzz/cursorwindow_fuzzer/Android.bp index 2dac47b0dac6e..b36ff0968ba35 100644 --- a/libs/androidfw/fuzz/cursorwindow_fuzzer/Android.bp +++ b/libs/androidfw/fuzz/cursorwindow_fuzzer/Android.bp @@ -27,5 +27,9 @@ cc_fuzz { "libutils", ], }, + darwin: { + // libbinder is not supported on mac + enabled: false, + }, }, }