commit f74b62e80a494394c76fd8f759bb199d98f80a31
author Xin Li <delphij@google.com> Mon May 06 12:09:27 2024 -0700
committer Xin Li <delphij@google.com> Mon May 06 12:09:27 2024 -0700
tree 202361321bc4db192fb28d1f2cb7d3e8a47a2f16
parent 5a425dd548db3b715043df15636bdb47bd2489a7
parent 542905c587507317f86352a8cf95bc9fd48b0667

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: Ibe1a49a38a05ecfb623c64fb48c812cc422a54e3
Change-Id: I3781ebcfa0b297aa89420245540d269ebecd613d

Android.bp

diff --git a/Android.bp b/Android.bp
index d9e0694..b88f541 100644
--- a/Android.bp
+++ b/Android.bp
@@ -109,10 +109,7 @@
     host_supported: true,
     recovery_available: true,
     vendor_available: true,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
+    double_loadable: true,
     target: {
         host: {
             exclude_shared_libs: [

modules/input/evdev/InputDevice.cpp

diff --git a/modules/input/evdev/InputDevice.cpp b/modules/input/evdev/InputDevice.cpp
index a1bce64..1e3da58 100644
--- a/modules/input/evdev/InputDevice.cpp
+++ b/modules/input/evdev/InputDevice.cpp
@@ -24,7 +24,6 @@
 
 #include <linux/input.h>
 
-#define __STDC_FORMAT_MACROS
 #include <cinttypes>
 #include <cstdlib>
 #include <string>