diff options
| author | Ben Cheng <bccheng@google.com> | 2013-02-19 19:24:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-19 19:24:15 +0000 |
| commit | 630e34afc8bdaa3ae1358b281efe4907cb887cc4 (patch) | |
| tree | c397b04afceb6984539512734c028520e25d3aa1 | |
| parent | 080ebb5ffd89359f34650222d735dfe356616f69 (diff) | |
| parent | 30a14ad472ca40f299c4ef3fa5e3015e16a3d475 (diff) | |
| download | valgrind-630e34afc8bdaa3ae1358b281efe4907cb887cc4.tar.gz | |
Merge "Add missing ioctl wrappers for Nexus 7."
| -rw-r--r-- | main/Android.mk | 2 | ||||
| -rw-r--r-- | main/coregrind/m_syswrap/syswrap-linux.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/main/Android.mk b/main/Android.mk index b783fa6d9..08db43ce7 100644 --- a/main/Android.mk +++ b/main/Android.mk @@ -44,6 +44,8 @@ tool_ldflags := -static -Wl,--build-id=none,-Ttext=0x38000000 -nodefaultlibs -no # 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 else diff --git a/main/coregrind/m_syswrap/syswrap-linux.c b/main/coregrind/m_syswrap/syswrap-linux.c index 74c520181..526ff0c56 100644 --- a/main/coregrind/m_syswrap/syswrap-linux.c +++ b/main/coregrind/m_syswrap/syswrap-linux.c @@ -4300,6 +4300,11 @@ PRE(sys_ioctl) case 0x4d07: case 0x6101: return; +# elif defined(ANDROID_HARDWARE_nexus_7) + /* undocumented ioctl ids noted on the device */ + case 0x4e04: + case 0x7231: + return; # endif default: @@ -5665,6 +5670,7 @@ POST(sys_ioctl) POST_MEM_WRITE(ARG3, size); } +# elif defined(ANDROID_HARDWARE_nexus_7) # else /* no ANDROID_HARDWARE_anything defined */ @@ -5675,6 +5681,7 @@ POST(sys_ioctl) # 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 "" |