Merge pull request #111 from google/soname-textrel-elf

fix bug #109

Author: borisf

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/ApkTranslator.java

@@ -82,7 +82,15 @@ public void apply() {
             elements.add(element);
         }
 
-        ELEMENT element = new ELEMENT("\nNative Libraries\n",
+        ELEMENT element = new ELEMENT("\nDynamic Symbol Errors", TAG.DOCUMENT);
+        elements.add(element);
+
+        for (String error : apkAnalysis.errors) {
+            element = new ELEMENT("\n" + error, TAG.DOCUMENT);
+            elements.add(element);
+        }
+
+        element = new ELEMENT("\n\n\nNative Libraries\n",
                 TAG.DOCUMENT);
 
         elements.add(element);
@@ -103,12 +111,14 @@ public void apply() {
         List<String> nativeLibNames = extractLibNames(apkAnalysis.nativeLibs);
         for (String nativeLib : sortedNativeDependencies) {
             element = new ELEMENT(nativeLib + " " +
-                    PrivateNativeLibsInspector.check(nativeLib, nativeLibNames) + "\n", TAG.DOCUMENT);
+                    PrivateNativeLibsInspector.check(nativeLib, nativeLibNames) +
+                    "\n", TAG.DOCUMENT);
             elements.add(element);
         }
-    }
 
 
+    }
+
     private static List<String> extractLibNames(List<String> nativeLibs) {
         // libs/x86/lib.so\n ==> libs.so
         LinkedList<String> result = new LinkedList<>();
@@ -191,6 +201,7 @@ private static class ApkAnalysis {
         public List<String> nativeLibs = new ArrayList<>();
         public TreeSet<DexData> dexes = new TreeSet<>();
         public TreeSet<String> nativeDependencies = new TreeSet<>();
+        public List<String> errors = new LinkedList<>();
 
         public String toString() {
             return dexes + "\n\n"
@@ -236,6 +247,12 @@ private static ApkAnalysis doInspect(File binaryArchiveFile) {
                             result.nativeDependencies.add(dependency);
                         }
 
+                        DynamicSymbolsInspector dsi = new DynamicSymbolsInspector(dependenciesReader);
+
+                        if (dsi.areErrors()) {
+                            result.errors.add(zipEntry.getName() + " " + dsi.getErrors());
+                        }
+
                         result.nativeLibs.add(zipEntry.getName() + "\n");
                     }
                 }

ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/DynamicSymbolsInspector.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.classyshark.silverghost.translator.apk;
+
+import java.io.IOException;
+import nl.lxtreme.binutils.elf.Elf;
+
+public class DynamicSymbolsInspector {
+
+    private Elf elf;
+    private String errors = "";
+    private boolean areErrors = false;
+
+    public DynamicSymbolsInspector(Elf elf) {
+        this.elf = elf;
+        inspect();
+    }
+
+    public boolean areErrors() {
+        return areErrors;
+    }
+
+    public String getErrors() {
+        return this.errors;
+    }
+
+    private void inspect() {
+        try {
+            if (!elf.isSoname()) {
+                errors += " missing SONAME ";
+                areErrors = true;
+            }
+
+            if (elf.isTextRel()) {
+                errors += " text relocations found ";
+                areErrors = true;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

ClassySharkWS/src/com/google/classyshark/silverghost/translator/elf/ElfTranslator.java

@@ -102,8 +102,7 @@ public List<String> getDependencies() {
 
     // TODO currently support only dexes, here is how to do for jar
     // TODO https://github.com/adamheinrich/native-utils/blob/master/NativeUtils.java
-    public static File extractElf(String elfName,
-                                   File apkFile) {
+    public static File extractElf(String elfName, File apkFile) {
         File file = new File("classes.dex");
         ZipInputStream zipFile;
         try {