Revert^2 "Improve error message when invalid display id is passed to screencap with -d argument."
This reverts commit 5e6a24974f91f99adaf2f5671f0aefa8f60aa07d.
Reason for revert: Roll forward with fix for failing test.
Test: adb shell screenap; unit test.
Bug: 306733214
Flag: EXEMPT bugfix
Change-Id: I6b57de337f8b1278fc4452874ecc5a127b94b11a
diff --git a/cmds/screencap/Android.bp b/cmds/screencap/Android.bp
index 16026ec..9f350b1 100644
--- a/cmds/screencap/Android.bp
+++ b/cmds/screencap/Android.bp
@@ -7,25 +7,66 @@
default_applicable_licenses: ["frameworks_base_license"],
}
-cc_binary {
- name: "screencap",
-
- srcs: ["screencap.cpp"],
-
- shared_libs: [
- "libcutils",
- "libutils",
- "libbinder",
- "libjnigraphics",
- "libhwui",
- "libui",
- "libgui",
- ],
+cc_defaults {
+ name: "screencap_defaults",
cflags: [
"-Wall",
"-Werror",
- "-Wunused",
"-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",
],
}