1 files changed, 13 insertions, 43 deletions
diff --git a/otafault/Android.bp b/fuse_sideload/Android.bp
index b39d5bee2..90c4c22c3 100644
--- a/otafault/Android.bp
+++ b/fuse_sideload/Android.bp
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 The Android Open Source Project
+// Copyright (C) 2018 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,57 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_static {
-    name: "libotafault",
-
-    host_supported: true,
-
-    srcs: [
-        "config.cpp",
-        "ota_io.cpp",
-    ],
-
-    static_libs: [
-        "libbase",
-        "liblog",
-        "libziparchive",
-    ],
-
-    export_include_dirs: [
-        "include",
-    ],
+cc_library {
+    name: "libfusesideload",
+    recovery_available: true,
 
     cflags: [
-        "-D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS",
+        "-D_XOPEN_SOURCE",
+        "-D_GNU_SOURCE",
         "-Wall",
         "-Werror",
-        "-Wthread-safety",
-        "-Wthread-safety-negative",
     ],
 
-    target: {
-        darwin: {
-            enabled: false,
-        },
-    },
-}
-
-cc_test {
-    name: "otafault_test",
-
-    srcs: ["test.cpp"],
-
-    cflags: [
-        "-Wall",
-        "-Werror",
+    srcs: [
+        "fuse_sideload.cpp",
     ],
 
-    static_executable: true,
+    export_include_dirs: [
+        "include",
+    ],
 
-    static_libs: [
-        "libotafault",
-        "libziparchive",
+    shared_libs: [
         "libbase",
-        "liblog",
+        "libcrypto",
     ],
 }