Move installd back to Android.mk.
An upcoming CL will be compiling an AIDL for installd, which the new
build system doesn't support yet.
Test: builds, boots
Bug: 13758960, 30944031
Change-Id: I47f9ef21eb6040072c402d40ae42a95d7bd0e61d
diff --git a/cmds/installd/Android.mk b/cmds/installd/Android.mk
index d29e5ba..17886fa 100644
--- a/cmds/installd/Android.mk
+++ b/cmds/installd/Android.mk
@@ -50,3 +50,46 @@
LOCAL_REQUIRED_MODULES := otapreopt otapreopt_chroot otapreopt_slot
include $(BUILD_PREBUILT)
+
+common_src_files := commands.cpp globals.cpp utils.cpp
+common_cflags := -Wall -Werror
+
+#
+# Static library used in testing and executable
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libinstalld
+LOCAL_MODULE_TAGS := eng tests
+LOCAL_SRC_FILES := $(common_src_files)
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_SHARED_LIBRARIES := \
+ libbase \
+ liblogwrap \
+ libselinux \
+
+LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+LOCAL_CLANG := true
+include $(BUILD_STATIC_LIBRARY)
+
+#
+# Executable
+#
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := installd
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS := $(common_cflags)
+LOCAL_SRC_FILES := installd.cpp $(common_src_files)
+LOCAL_SHARED_LIBRARIES := \
+ libbase \
+ libcutils \
+ liblog \
+ liblogwrap \
+ libselinux \
+
+LOCAL_STATIC_LIBRARIES := libdiskusage
+LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+LOCAL_INIT_RC := installd.rc
+LOCAL_CLANG := true
+include $(BUILD_EXECUTABLE)