Moved libdumpstate.default back to Android.mk
When this module was moved to Android.bp it had no dependencies, but now
it depends on modules defined on Android.mk.
BUG: 26379932
BUG: 31636879
Test: m libdumpstate.default
Change-Id: I577ef5ca16738854dd03adf5d0b090ac10ef5d28
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp
deleted file mode 100644
index db61661..0000000
--- a/cmds/dumpstate/Android.bp
+++ /dev/null
@@ -1,6 +0,0 @@
-cc_library_static {
- name: "libdumpstate.default",
- srcs: ["libdumpstate_default.cpp"],
- // TODO: should use libdumpstateheaders, but if fails with 'undefined'
- static_libs: ["libbase", "libziparchive", "libz"]
-}
diff --git a/cmds/dumpstate/Android.mk b/cmds/dumpstate/Android.mk
index 116650d..da39d3a 100644
--- a/cmds/dumpstate/Android.mk
+++ b/cmds/dumpstate/Android.mk
@@ -117,3 +117,14 @@
LOCAL_PICKUP_FILES := $(dist_zip_root)
include $(BUILD_NATIVE_TEST)
+
+# =======================#
+# libdumpstate.default #
+# =======================#
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := libdumpstate_default.cpp
+LOCAL_MODULE := libdumpstate.default
+
+LOCAL_STATIC_LIBRARIES := libdumpstateheaders
+include $(BUILD_STATIC_LIBRARY)