commit b66c61120582afae5cac3d7c32746cbcff95eea8
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 02 23:34:10 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 02 23:34:10 2024 +0000
tree 8e09ddf7d2a4a09dcd17d760e202fcb0b9b881de
parent d575c5b7844621c9d49a9fdd4ca97a5faadf312e
parent 61438383b5f2def20b5d713e094e529cc99caa2d

Merge changes Ieca708fe,Ic1647135 into main

* changes:
  Fix doc typo.
  Fix C incompatibilities.

include/android/thermal.h

diff --git a/include/android/thermal.h b/include/android/thermal.h
index fa168cd..7f9d2ed 100644
--- a/include/android/thermal.h
+++ b/include/android/thermal.h
@@ -85,6 +85,7 @@
     /** Need shutdown immediately. */
     ATHERMAL_STATUS_SHUTDOWN = 6,
 };
+typedef enum AThermalStatus AThermalStatus;
 
 /**
  * An opaque type representing a handle to a thermal manager.
@@ -240,6 +241,7 @@
     float headroom;
     AThermalStatus thermalStatus;
 };
+typedef struct AThermalHeadroomThreshold AThermalHeadroomThreshold;
 
 /**
  * Gets the thermal headroom thresholds for all available thermal status.

services/gpuservice/gpuwork/bpfprogs/Android.bp

diff --git a/services/gpuservice/gpuwork/bpfprogs/Android.bp b/services/gpuservice/gpuwork/bpfprogs/Android.bp
index 8e872fb..2e444fe 100644
--- a/services/gpuservice/gpuwork/bpfprogs/Android.bp
+++ b/services/gpuservice/gpuwork/bpfprogs/Android.bp
@@ -19,8 +19,6 @@
 bpf {
     name: "gpuWork.o",
     srcs: ["gpuWork.c"],
-    // Without btf disabled, presubmits will fail.
-    btf: false,
     cflags: [
         "-Wthread-safety",
         "-Wunreachable-code",