commit b39686b443f5f9b20e1b4a3358f7a5b8749fca63
author Luke Huang <huangluke@google.com> Wed Sep 22 17:31:13 2021 +0800
committer Luke Huang <huangluke@google.com> Thu Sep 23 06:01:36 2021 +0000
tree dca38e01acd3759bc40aaabe2c0598921c261291
parent 072497e6e4652ff27dfc1ab8cc943ffb154556e1

Default enable DoH feature in T

Bug: 200763585
Bug: 155855709
Test: atest
Change-Id: I1a99889891ef7212aa618198c4840488d23a35d9

Android.bp

diff --git a/Android.bp b/Android.bp
index 6e15991..d14f28c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -195,6 +195,7 @@
         "libcutils",
         "libnetdutils",
         "libdoh_ffi",
+        "libmodules-utils-build",
         "libprotobuf-cpp-lite",
         "libstatslog_resolv",
         "libstatspush_compat",

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 8bffd42..321098a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -180,6 +180,7 @@
         "libbpf_android",
         "libcrypto_static",
         "libgmock",
+        "libmodules-utils-build",
         "libnetd_test_dnsresponder_ndk",
         "libnetd_test_metrics_listener",
         "libnetd_test_resolv_utils",

util.h

diff --git a/util.h b/util.h
index 0c37851..a5eb556 100644
--- a/util.h
+++ b/util.h
@@ -23,6 +23,7 @@
 #include <netinet/in.h>
 
 #include <android-base/properties.h>
+#include <android-modules-utils/sdk_level.h>
 
 #include "Experiments.h"
 
@@ -60,5 +61,8 @@
 }
 
 inline bool isDoHEnabled() {
+    // STOPSHIP(b/200763585): clean up it before T shipping.
+    if (android::modules::sdklevel::IsAtLeastT()) return 1;
+
     return android::net::Experiments::getInstance()->getFlag("doh", 0);
 }