Snap for 11296156 from 44f9321fb512b447aff1b623463e182bc5c35455 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: I0965b0b3aaabe0bb008c24653312dc728ad134cd

1 files changed, 44 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 56429eb2..357b58f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -145,10 +145,12 @@ cc_defaults {
     srcs: [
         "src/agent/application.cpp",
         "src/android/otdaemon_server.cpp",
+        "src/android/otdaemon_telemetry.cpp",
         "src/border_agent/border_agent.cpp",
         "src/ncp/ncp_openthread.cpp",
         "src/sdp_proxy/advertising_proxy.cpp",
         "src/sdp_proxy/discovery_proxy.cpp",
+        "src/common/code_utils.cpp",
         "src/common/dns_utils.cpp",
         "src/common/logging.cpp",
         "src/common/mainloop.cpp",
@@ -175,12 +177,17 @@ cc_defaults {
         "libcutils",
         "libbinder_ndk",
         "android.hardware.threadnetwork-V1-ndk",
+        "liblog",
+        "libstatssocket",
     ],
 
     static_libs: [
         "libopenthread-cli",
         "ot-core",
         "ot-daemon-aidl-ndk",
+        "libstatslog_threadnetwork",
+        "threadnetwork-atom-cc-proto-lite",
+        "libprotobuf-cpp-lite",
     ],
 
     host_ldlibs: ["-lutil"],
@@ -217,3 +224,40 @@ cc_fuzz {
         ],
     },
 }
+
+cc_library_static {
+    name: "libstatslog_threadnetwork",
+    generated_sources: ["statslog_threadnetwork.cpp"],
+    generated_headers: ["statslog_threadnetwork.h"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    export_generated_headers: ["statslog_threadnetwork.h"],
+    shared_libs: [
+        "libcutils",
+        "liblog",
+        "libstatssocket",
+        "libutils",
+    ],
+    min_sdk_version: "30",
+    apex_available: [ "com.android.tethering" ],
+}
+
+genrule {
+    name: "statslog_threadnetwork.h",
+    tools: ["stats-log-api-gen"],
+    cmd: "$(location stats-log-api-gen) --header $(genDir)/statslog_threadnetwork.h --module threadnetwork --namespace threadnetwork",
+    out: [
+        "statslog_threadnetwork.h",
+    ],
+}
+
+genrule {
+    name: "statslog_threadnetwork.cpp",
+    tools: ["stats-log-api-gen"],
+    cmd: "$(location stats-log-api-gen) --cpp $(genDir)/statslog_threadnetwork.cpp --module threadnetwork --namespace threadnetwork --importHeader statslog_threadnetwork.h",
+    out: [
+        "statslog_threadnetwork.cpp",
+    ],
+}