commit 5818e894dfb7c1504c35dc8077ac5a0d309b2362
author Tao Bao <tbao@google.com> Fri May 04 16:08:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 04 16:08:18 2018 +0000
tree 55d24b52c2b73dc7e15db0216a0a3df314ec0037
parent fb86bb2a074cdec6d82e1df7304f1c41309ec220
parent 13446c032b24964f061c6cf094dc11b3d17e34fa

Merge "otautil: Only build the needed files for host build."

otautil/Android.bp

diff --git a/otautil/Android.bp b/otautil/Android.bp
index 45d119c..572d8df 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -17,17 +17,13 @@
 
     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 @@
     ],
 
     target: {
-        darwin: {
-            exclude_srcs: [
+        android: {
+            srcs: [
+                "DirUtil.cpp",
+                "SysUtil.cpp",
+                "ThermalUtil.cpp",
                 "mounts.cpp",
             ],
+
+            static_libs: [
+                "libselinux",
+            ],
         },
     },
 }