From 13446c032b24964f061c6cf094dc11b3d17e34fa Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 3 May 2018 22:23:55 -0700 Subject: [PATCH] otautil: Only build the needed files for host build. This avoids unnecessarily breaking mac build. Test: `mmma -j bootable/recovery` on Linux and macOS. Change-Id: I1dc00364c895866a4757c2a43beb3432ae1e4113 --- otautil/Android.bp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/otautil/Android.bp b/otautil/Android.bp index 45d119cb..572d8df8 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -17,17 +17,13 @@ cc_library_static { host_supported: true, + // Minimal set of files to support host build. srcs: [ - "SysUtil.cpp", - "DirUtil.cpp", - "ThermalUtil.cpp", - "mounts.cpp", "paths.cpp", "rangeset.cpp", ], static_libs: [ - "libselinux", "libbase", ], @@ -42,10 +38,17 @@ cc_library_static { ], target: { - darwin: { - exclude_srcs: [ + android: { + srcs: [ + "DirUtil.cpp", + "SysUtil.cpp", + "ThermalUtil.cpp", "mounts.cpp", ], + + static_libs: [ + "libselinux", + ], }, }, }