9 files changed, 5 insertions, 33 deletions
diff --git a/otautil/Android.bp b/otautil/Android.bp
index 6f816a17d..c8f974688 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -39,32 +39,4 @@ cc_library_static {
     export_include_dirs: [
         "include",
     ],
-
-    target: {
-        android: {
-            srcs: [
-                "logging.cpp",
-                "parse_install_logs.cpp",
-                "roots.cpp",
-                "thermalutil.cpp",
-            ],
-
-            include_dirs: [
-                "system/vold",
-            ],
-
-            static_libs: [
-                "libfstab",
-            ],
-
-            shared_libs: [
-                "libext4_utils",
-                "libfs_mgr",
-            ],
-
-            export_static_lib_headers: [
-                "libfstab",
-            ],
-        },
-    },
 }
diff --git a/otautil/include/otautil/logging.h b/recovery_utils/include/recovery_utils/logging.h
index 4462eca6e..4462eca6e 100644
--- a/otautil/include/otautil/logging.h
+++ b/recovery_utils/include/recovery_utils/logging.h
diff --git a/otautil/include/otautil/parse_install_logs.h b/recovery_utils/include/recovery_utils/parse_install_logs.h
index 135d29ccf..135d29ccf 100644
--- a/otautil/include/otautil/parse_install_logs.h
+++ b/recovery_utils/include/recovery_utils/parse_install_logs.h
diff --git a/otautil/include/otautil/roots.h b/recovery_utils/include/recovery_utils/roots.h
index 92ee756f0..92ee756f0 100644
--- a/otautil/include/otautil/roots.h
+++ b/recovery_utils/include/recovery_utils/roots.h
diff --git a/otautil/include/otautil/thermalutil.h b/recovery_utils/include/recovery_utils/thermalutil.h
index 43ab55940..43ab55940 100644
--- a/otautil/include/otautil/thermalutil.h
+++ b/recovery_utils/include/recovery_utils/thermalutil.h
diff --git a/otautil/logging.cpp b/recovery_utils/logging.cpp
index 3db0e8ac2..52f12a8d8 100644
--- a/otautil/logging.cpp
+++ b/recovery_utils/logging.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "otautil/logging.h"
+#include "recovery_utils/logging.h"
 
 #include <dirent.h>
 #include <errno.h>
@@ -38,7 +38,7 @@
 
 #include "otautil/dirutil.h"
 #include "otautil/paths.h"
-#include "otautil/roots.h"
+#include "recovery_utils/roots.h"
 
 constexpr const char* LOG_FILE = "/cache/recovery/log";
 constexpr const char* LAST_INSTALL_FILE = "/cache/recovery/last_install";
diff --git a/otautil/parse_install_logs.cpp b/recovery_utils/parse_install_logs.cpp
index 13a729921..c86317623 100644
--- a/otautil/parse_install_logs.cpp
+++ b/recovery_utils/parse_install_logs.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "otautil/parse_install_logs.h"
+#include "recovery_utils/parse_install_logs.h"
 
 #include <unistd.h>
 
diff --git a/otautil/roots.cpp b/recovery_utils/roots.cpp
index e098b4b77..f717ec208 100644
--- a/otautil/roots.cpp
+++ b/recovery_utils/roots.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "otautil/roots.h"
+#include "recovery_utils/roots.h"
 
 #include <fcntl.h>
 #include <stdint.h>
diff --git a/otautil/thermalutil.cpp b/recovery_utils/thermalutil.cpp
index 4660e057e..5436355d6 100644
--- a/otautil/thermalutil.cpp
+++ b/recovery_utils/thermalutil.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "otautil/thermalutil.h"
+#include "recovery_utils/thermalutil.h"
 
 #include <dirent.h>
 #include <stdio.h>