commit 48d7489e855df4126aee962087d3adaa763b26fe
author Chih-hung Hsieh <chh@google.com> Sat Dec 13 00:06:57 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 13 00:06:58 2014 +0000
tree 06eee1e47e476476f45ade203119529d1ab3ae20
parent 53432b46fac6a90ea401a8ff8097d56b5a345fad
parent 2bd412425981c590f6de6e16848b7c59c173c18d

Merge "Fix build with clang"

adb/set_verity_enable_state_service.c

diff --git a/adb/set_verity_enable_state_service.c b/adb/set_verity_enable_state_service.c
index 1e22149..09e2eb9 100644
--- a/adb/set_verity_enable_state_service.c
+++ b/adb/set_verity_enable_state_service.c
@@ -44,6 +44,7 @@
     adb_write(fd, buffer, strnlen(buffer, sizeof(buffer)));
 }
 
+#ifdef ALLOW_ADBD_DISABLE_VERITY
 static int get_target_device_size(int fd, const char *blk_device,
                                   uint64_t *device_size)
 {
@@ -157,6 +158,7 @@
         adb_close(device);
     return retval;
 }
+#endif
 
 void set_verity_enabled_state_service(int fd, void* cookie)
 {
@@ -207,11 +209,11 @@
         write_console(fd,
                       "Now reboot your device for settings to take effect\n");
     }
+errout:
 #else
     write_console(fd, "%s-verity only works for userdebug builds\n",
                   enable ? "enable" : "disable");
 #endif
 
-errout:
     adb_close(fd);
 }