1 files changed, 42 insertions, 5 deletions
diff --git a/thermal/Android.bp b/thermal/Android.bp
index 61403b31..afd3c811 100644
--- a/thermal/Android.bp
+++ b/thermal/Android.bp
@@ -15,6 +15,7 @@ cc_binary {
         "utils/powerhal_helper.cpp",
         "utils/thermal_stats_helper.cpp",
         "utils/thermal_watcher.cpp",
+        "virtualtemp_estimator/virtualtemp_estimator.cpp",
     ],
     vendor: true,
     relative_install_path: "hw",
@@ -31,9 +32,9 @@ cc_binary {
         "libutils",
         "libnl",
         "libbinder_ndk",
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "android.hardware.power-V1-ndk",
-        "android.hardware.thermal-V1-ndk",
+        "android.hardware.thermal-V2-ndk",
         "pixel-power-ext-V1-ndk",
         "pixelatoms-cpp",
     ],
@@ -41,7 +42,7 @@ cc_binary {
         "libpixelstats",
     ],
     export_shared_lib_headers: [
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "pixelatoms-cpp",
     ],
     cflags: [
@@ -79,6 +80,7 @@ cc_test {
         "utils/thermal_watcher.cpp",
         "tests/mock_thermal_helper.cpp",
         "tests/thermal_looper_test.cpp",
+        "virtualtemp_estimator/virtualtemp_estimator.cpp",
     ],
     shared_libs: [
         "libbase",
@@ -88,9 +90,9 @@ cc_test {
         "libnl",
         "liblog",
         "libbinder_ndk",
-        "android.frameworks.stats-V1-ndk",
+        "android.frameworks.stats-V2-ndk",
         "android.hardware.power-V1-ndk",
-        "android.hardware.thermal-V1-ndk",
+        "android.hardware.thermal-V2-ndk",
         "pixel-power-ext-V1-ndk",
         "pixelatoms-cpp",
     ],
@@ -119,3 +121,38 @@ sh_binary {
         "pixel-thermal-symlinks.rc",
     ],
 }
+
+
+cc_binary {
+    name: "virtualtemp_estimator_test",
+    srcs: [
+        "virtualtemp_estimator/virtualtemp_estimator.cpp",
+        "virtualtemp_estimator/virtualtemp_estimator_test.cpp"
+        ],
+    shared_libs: [
+        "libc",
+        "liblog",
+        "libcutils",
+        "libbinder",
+        "libhidlbase",
+        "libutils",
+        "libjsoncpp",],
+    vendor: true,
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+        "-Wunused",
+    ],
+    tidy: true,
+    tidy_checks: [
+        "android-*",
+        "cert-*",
+        "clang-analyzer-security*",
+    ],
+    tidy_checks_as_errors: [
+        "android-*",
+        "clang-analyzer-security*",
+        "cert-*",
+    ],
+}