Merge tag 'android-10.0.0_r25' into aosp10-4
Android 10.0.0 release 25
diff --git a/otautil/Android.bp b/otautil/Android.bp
index a109d39..dd8f154 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -16,28 +16,60 @@
name: "libotautil",
host_supported: true,
+ recovery_available: true,
+ defaults: [
+ "recovery_defaults",
+ ],
+
+ // Minimal set of files to support host build.
srcs: [
+<<<<<<< HEAD
"SysUtil.cpp",
"DirUtil.cpp",
"ZipUtil.cpp",
"ThermalUtil.cpp",
"cache_location.cpp",
+=======
+ "paths.cpp",
+>>>>>>> android-10.0.0_r25
"rangeset.cpp",
],
- static_libs: [
- "libselinux",
+ shared_libs: [
"libbase",
],
- cflags: [
- "-D_FILE_OFFSET_BITS=64",
- "-Werror",
- "-Wall",
- ],
-
export_include_dirs: [
"include",
],
+
+ target: {
+ android: {
+ srcs: [
+ "dirutil.cpp",
+ "logging.cpp",
+ "mounts.cpp",
+ "parse_install_logs.cpp",
+ "roots.cpp",
+ "sysutil.cpp",
+ "thermalutil.cpp",
+ ],
+
+ include_dirs: [
+ "system/vold",
+ ],
+
+ static_libs: [
+ "libfstab",
+ ],
+
+ shared_libs: [
+ "libcutils",
+ "libext4_utils",
+ "libfs_mgr",
+ "libselinux",
+ ],
+ },
+ },
}