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

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: {
+        android: {
-            exclude_srcs: [
+            srcs: [
+                "DirUtil.cpp",
+                "SysUtil.cpp",
+                "ThermalUtil.cpp",
                 "mounts.cpp",
             ],
+
+            static_libs: [
+                "libselinux",
+            ],
         },
     },
 }