commit 6bff07130910f763ff15b92910b9a1f641c2ed8e
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Mar 19 23:40:29 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 23:40:29 2024 +0000
tree 42a70204a9dd15c5ea1480827787b000a2a09886
parent bc03d1ef7b2b42c1b17415ff9f54402950aaba54
parent 6e379d8fa0baa3bb8812884a535bfcac7388c03e

Merge "Snap for 11598262 from efa0719aba2f8721d6a6a652992edfc9df6ad975 to sdk-release" into sdk-release

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>