[XS] Change in flashrom[main]: hwaccess_x86_io: Fix Android compilation with bionic libc

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/83133?usp=email )

Change subject: hwaccess_x86_io: Fix Android compilation with bionic libc
......................................................................

hwaccess_x86_io: Fix Android compilation with bionic libc

Recently Android Bionic LibC got sys/io.h. Use this header to access
ioperm(). Use Assembly for I/O, as Bionic does not have inb(), outb(),
etc.

Tested on Android 14 by adding flashrom and pciutils as external repositories, adding Android.bp blueprints (Android specialized build system - Soong), building, running and accessing (read, erase, write) SPI flash on x86 device.

Change-Id: Id80b83c2718679c925ed6ddfe33cbe837eea0429
Signed-off-by: Jakub Czapiga 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/83133
Reviewed-by: Peter Marheine 
Reviewed-by: Hsuan-ting Chen 
Tested-by: build bot (Jenkins) 
Reviewed-by: Anastasia Klimchuk 
---
M hwaccess_x86_io.c
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Peter Marheine: Looks good to me, approved
  Hsuan-ting Chen: Looks good to me, approved
  build bot (Jenkins): Verified
  Anastasia Klimchuk: Looks good to me, approved

diff --git a/hwaccess_x86_io.c b/hwaccess_x86_io.c
index 93d29d8..70b7439 100644
--- a/hwaccess_x86_io.c
+++ b/hwaccess_x86_io.c
@@ -58,10 +58,11 @@
 #define USE_IOPERM		9

#if defined(__ANDROID__)
-#include <sys/glibc-syscalls.h>
+#include <sys/io.h>
+#include <unistd.h>

-#define IO_PORT_PERMISSION USE_IOPL
-#define IO_PORT_FUNCTION USE_LIBC_TARGET_LAST
+#define IO_PORT_PERMISSION USE_IOPERM
+#define IO_PORT_FUNCTION USE_ASM
 #endif

#if defined(__linux__) && !defined(__ANDROID__)