1 files changed, 11 insertions, 21 deletions
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp
index aff32c38c2..acca11acf7 100644
--- a/cmds/dumpstate/Android.bp
+++ b/cmds/dumpstate/Android.bp
@@ -13,15 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "frameworks_native_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["frameworks_native_license"],
-}
-
 cc_defaults {
     name: "dumpstate_cflag_defaults",
     cflags: [
@@ -99,7 +90,6 @@ cc_defaults {
         "libhidlbase",
         "liblog",
         "libutils",
-        "libbinderdebug",
     ],
     srcs: [
         "DumpstateService.cpp",
@@ -115,28 +105,34 @@ cc_binary {
     name: "dumpstate",
     defaults: ["dumpstate_defaults"],
     srcs: [
-        "DumpPool.cpp",
-        "TaskQueue.cpp",
         "dumpstate.cpp",
         "main.cpp",
     ],
     required: [
         "atrace",
-        "dmabuf_dump",
+        "df",
+        "getprop",
         "ip",
         "iptables",
+        "ip6tables",
+        "kill",
         "librank",
         "logcat",
         "lpdump",
         "lpdumpd",
+        "lsmod",
+        "lsof",
+        "netstat",
+        "printenv",
         "procrank",
         "screencap",
         "showmap",
         "ss",
         "storaged",
-        "toolbox",
-        "toybox",
+        "top",
+        "uptime",
         "vdc",
+        "vril-dump",
     ],
     init_rc: ["dumpstate.rc"],
 }
@@ -145,8 +141,6 @@ cc_test {
     name: "dumpstate_test",
     defaults: ["dumpstate_defaults"],
     srcs: [
-        "DumpPool.cpp",
-        "TaskQueue.cpp",
         "dumpstate.cpp",
         "tests/dumpstate_test.cpp",
     ],
@@ -163,14 +157,10 @@ cc_test {
     name: "dumpstate_smoke_test",
     defaults: ["dumpstate_defaults"],
     srcs: [
-        "DumpPool.cpp",
-        "TaskQueue.cpp",
         "dumpstate.cpp",
         "tests/dumpstate_smoke_test.cpp",
     ],
     static_libs: ["libgmock"],
-    test_config: "dumpstate_smoke_test.xml",
-    test_suites: ["device-tests"],
 }