commit 559743909a7416c06f06d8a560536032a0b0511e
author David Ng <dave@codeaurora.org> Wed Dec 04 14:41:18 2013 -0800
committer Daniel Xie <dxie@google.com> Tue Jul 14 20:58:03 2015 +0000
tree c02739432e9a239911b0ef1b88cfed9afd9037e3
parent 36db51ef5e11be0c7f5c10fdace0ef2d5fa78e93

AbiTest: Include QDSP6 ELF binaries in validity check

The file system on the device can be used to store executables
and libraries for processors other than the main CPU.  The
architecture of these processors may not be in the list that
AbiTest flags as valid.  Add QDSP6 ELF machine type to the list.

Change-Id: Ica101d0b4ee374e25b63d147bf0501ad751fed76
(cherry picked from commit 65022f93722114bd245b02fe811280a8195415e3)

tests/src/android/os/cts/ReadElf.java

diff --git a/tests/src/android/os/cts/ReadElf.java b/tests/src/android/os/cts/ReadElf.java
index b0d5e74..c2da318 100644
--- a/tests/src/android/os/cts/ReadElf.java
+++ b/tests/src/android/os/cts/ReadElf.java
@@ -38,6 +38,8 @@
     private static final int EM_386 = 3;
     private static final int EM_MIPS = 8;
     private static final int EM_ARM = 40;
+    // http://en.wikipedia.org/wiki/Qualcomm_Hexagon
+    private static final int EM_QDSP6 = 164;
 
     /** Size of the e_ident[] structure in the ELF header. */
     private static final int EI_NIDENT = 16;
@@ -278,7 +280,8 @@
     private void readHeader() throws IOException {
         mType = readHalf(getHeaderOffset(OFFSET_TYPE));
         int e_machine = readHalf(getHeaderOffset(OFFSET_MACHINE));
-        if (e_machine != EM_386 && e_machine != EM_MIPS && e_machine != EM_ARM) {
+        if (e_machine != EM_386 && e_machine != EM_MIPS && e_machine != EM_ARM &&
+                e_machine != EM_QDSP6) {
             throw new IOException("Invalid ELF e_machine: " + e_machine + ": " + mPath);
         }