commit 0e0fd6c28659387a1383a6b1c2900d481be0066d
author Ben Cheng <bccheng@google.com> Mon Mar 11 15:24:27 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 15:24:27 2013 -0700
tree 07f02fd0ed9224bac2cd2f1a1ccebde9623c3450
parent 2de9c3263aa57c89ba36b88c304f9c5658bfbfb5
parent 1cd04c8275bf97407494e356ee07f1f7d38517bd

am 1cd04c82: Merge "Add missing ioctl wrappers for Nexus 7."

* commit '1cd04c8275bf97407494e356ee07f1f7d38517bd':
  Add missing ioctl wrappers for Nexus 7.

main/Android.mk

diff --git a/main/Android.mk b/main/Android.mk
index 35057e2..bcd8858 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -44,6 +44,8 @@
 # ioctl/syscall wrappers are device dependent
 ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),manta)
 ANDROID_HARDWARE := ANDROID_HARDWARE_nexus_10
+else ifeq ($(TARGET_BOOTLOADER_BOARD_NAME),grouper)
+ANDROID_HARDWARE := ANDROID_HARDWARE_nexus_7
 endif
 common_cflags += -D$(ANDROID_HARDWARE)
 

main/coregrind/m_syswrap/syswrap-linux.c

diff --git a/main/coregrind/m_syswrap/syswrap-linux.c b/main/coregrind/m_syswrap/syswrap-linux.c
index 89c8c77..0b4a98b 100644
--- a/main/coregrind/m_syswrap/syswrap-linux.c
+++ b/main/coregrind/m_syswrap/syswrap-linux.c
@@ -4308,6 +4308,11 @@
    case 0x7231:
    case 0x4004e901: /* used by NFC */
       return;
+#  elif defined(ANDROID_HARDWARE_nexus_7)
+   /* undocumented ioctl ids noted on the device */
+   case 0x4e04:
+   case 0x7231:
+      return;
 #  endif
 
    default:
@@ -5673,6 +5678,7 @@
       POST_MEM_WRITE(ARG3, size);
    }
 
+#  elif defined(ANDROID_HARDWARE_nexus_7)
 
 #  else /* no ANDROID_HARDWARE_anything defined */
 
@@ -5683,6 +5689,7 @@
 #   warning ""
 #   warning "   ANDROID_HARDWARE_nexus_s       Samsung Nexus S"
 #   warning "   ANDROID_HARDWARE_nexus_10      Samsung Nexus 10"
+#   warning "   ANDROID_HARDWARE_nexus_7       ASUS Nexus 7"
 #   warning "   ANDROID_HARDWARE_generic       Generic device (eg, Pandaboard)"
 #   warning "   ANDROID_HARDWARE_emulator      x86 or arm emulator"
 #   warning ""