diff --git a/cmds/screencap/Android.bp b/cmds/screencap/Android.bp
index 9f350b1..16026ec 100644
--- a/cmds/screencap/Android.bp
+++ b/cmds/screencap/Android.bp
@@ -7,66 +7,25 @@
     default_applicable_licenses: ["frameworks_base_license"],
 }
 
-cc_defaults {
-    name: "screencap_defaults",
+cc_binary {
+    name: "screencap",
+
+    srcs: ["screencap.cpp"],
+
+    shared_libs: [
+        "libcutils",
+        "libutils",
+        "libbinder",
+        "libjnigraphics",
+        "libhwui",
+        "libui",
+        "libgui",
+    ],
 
     cflags: [
         "-Wall",
         "-Werror",
-        "-Wunreachable-code",
         "-Wunused",
-    ],
-
-    shared_libs: [
-        "libbinder",
-        "libcutils",
-        "libgui",
-        "libhwui",
-        "libjnigraphics",
-        "libui",
-        "libutils",
-    ],
-}
-
-cc_library {
-    name: "libscreencap",
-
-    defaults: [
-        "screencap_defaults",
-    ],
-
-    srcs: ["screencap_utils.cpp"],
-}
-
-cc_binary {
-    name: "screencap",
-
-    defaults: [
-        "screencap_defaults",
-    ],
-
-    srcs: ["screencap.cpp"],
-
-    static_libs: [
-        "libscreencap",
-    ],
-}
-
-cc_test {
-    name: "libscreencap_test",
-
-    defaults: [
-        "screencap_defaults",
-    ],
-
-    test_suites: ["device-tests"],
-
-    srcs: [
-        "tests/screencap_test.cpp",
-    ],
-
-    static_libs: [
-        "libgmock",
-        "libscreencap",
+        "-Wunreachable-code",
     ],
 }