commit 579ddc7b8bc74d23618b8cd0e7f1043d17fa3009
author Luke Huang <huangluke@google.com> Fri Jun 14 00:59:39 2019 +0800
committer Luke Huang <huangluke@google.com> Fri Jun 14 06:46:10 2019 +0000
tree dc6b12eeb5753feb55cb979c813d0ea487456426
parent 9d2d25bc0eba6fa7206f3f094dcbd0dfc8cd3f24

Move SHA256_SIZE define to libnetdutils and stop including netd header

Bug: 135235267
Test: m
      cd system/netd && atest
Change-Id: Ibe1dc22a2f3b762f10475e135613a9030bbe28b4

DnsResolverService.cpp

diff --git a/DnsResolverService.cpp b/DnsResolverService.cpp
index 2a8221c..1ac467f 100644
--- a/DnsResolverService.cpp
+++ b/DnsResolverService.cpp
@@ -29,12 +29,12 @@
 #include <json/writer.h>
 #include <log/log.h>
 #include <netdutils/DumpWriter.h>
+#include <netdutils/NetworkConstants.h>  // SHA256_SIZE
 #include <openssl/base64.h>
 #include <private/android_filesystem_config.h>  // AID_SYSTEM
 
 #include "BinderUtil.h"
 #include "DnsResolver.h"
-#include "NetdConstants.h"    // SHA256_SIZE
 #include "NetdPermissions.h"  // PERM_*
 #include "ResolverEventReporter.h"
 #include "resolv_cache.h"
@@ -186,7 +186,7 @@
     } else {
         decoded.clear();
     }
-    if (out_len != SHA256_SIZE) {
+    if (out_len != android::netdutils::SHA256_SIZE) {
         decoded.clear();
     }
     return decoded;