Revert "Move installd back to Android.mk."
This reverts commit 00b6f68c5c72252542a1e8c5dda4b420ed02c947 and
converts the new entries to Android.bp now that Soong supports AIDL.
Test: mmma -j framework/native/cmds/installd
Test: /data/nativetest64/installd_utils_test/installd_utils_test; fails
the same before/after
Change-Id: I327eb0bc28fa84cda669ec0df59da82ee10caf1f
diff --git a/cmds/installd/Android.bp b/cmds/installd/Android.bp
index 8b239ad..4ed45ae 100644
--- a/cmds/installd/Android.bp
+++ b/cmds/installd/Android.bp
@@ -1,3 +1,57 @@
+cc_defaults {
+ name: "installd_defaults",
+
+ cflags: [
+ "-Wall",
+ "-Werror",
+ ],
+ srcs: [
+ "commands.cpp",
+ "globals.cpp",
+ "utils.cpp",
+ "binder/android/os/IInstalld.aidl",
+ ],
+ shared_libs: [
+ "libbase",
+ "libbinder",
+ "libcutils",
+ "liblog",
+ "liblogwrap",
+ "libselinux",
+ "libutils",
+ ],
+
+ clang: true,
+}
+
+//
+// Static library used in testing and executable
+//
+
+cc_library_static {
+ name: "libinstalld",
+ defaults: ["installd_defaults"],
+
+ export_include_dirs: ["."],
+ aidl: {
+ export_aidl_headers: true,
+ },
+}
+
+//
+// Executable
+//
+
+cc_binary {
+ name: "installd",
+ defaults: ["installd_defaults"],
+ srcs: ["installd.cpp"],
+
+ static_libs: ["libdiskusage"],
+
+ init_rc: ["installd.rc"],
+}
+
// OTA chroot tool
cc_binary {
@@ -14,3 +68,5 @@
"liblog",
],
}
+
+subdirs = ["tests"]