commit 74a77bc0c70513edc4ab42be8cc79825f9af5c33
author Alex Light <allight@google.com> Fri Dec 11 10:58:13 2015 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 11 10:58:13 2015 -0800
tree 01e9d72c00109897fa504a9d2dbe25c019c8f6f9
parent 53c4b4d464b33d9cdc8f9bd60f8be6279e0b1570
parent 8247c5fd94b61e9cbfc08a2cd453b67aa5f2a444

Merge "Make \'dexdump2 -l xml\' include whether each class is an interface." am: 66e43b115e
am: 8247c5fd94

* commit '8247c5fd94b61e9cbfc08a2cd453b67aa5f2a444':
  Make 'dexdump2 -l xml' include whether each class is an interface.

dexdump/dexdump.cc

diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc
index d387726..9a18635 100644
--- a/dexdump/dexdump.cc
+++ b/dexdump/dexdump.cc
@@ -1319,6 +1319,8 @@
       fprintf(gOutFile, " extends=\"%s\"\n", tmp);
       free(tmp);
     }
+    fprintf(gOutFile, " interface=%s\n",
+            quotedBool((pClassDef.access_flags_ & kAccInterface) != 0));
     fprintf(gOutFile, " abstract=%s\n", quotedBool((pClassDef.access_flags_ & kAccAbstract) != 0));
     fprintf(gOutFile, " static=%s\n", quotedBool((pClassDef.access_flags_ & kAccStatic) != 0));
     fprintf(gOutFile, " final=%s\n", quotedBool((pClassDef.access_flags_ & kAccFinal) != 0));

test/dexdump/bytecodes.xml

diff --git a/test/dexdump/bytecodes.xml b/test/dexdump/bytecodes.xml
index 8e54dd3..d08c2e9 100755
--- a/test/dexdump/bytecodes.xml
+++ b/test/dexdump/bytecodes.xml
@@ -3,6 +3,7 @@
 >
 <class name="SuppressLint"
  extends="java.lang.Object"
+ interface="true"
  abstract="true"
  static="false"
  final="false"
@@ -23,6 +24,7 @@
 </class>
 <class name="TargetApi"
  extends="java.lang.Object"
+ interface="true"
  abstract="true"
  static="false"
  final="false"
@@ -46,6 +48,7 @@
 >
 <class name="BuildConfig"
  extends="java.lang.Object"
+ interface="false"
  abstract="false"
  static="false"
  final="true"
@@ -70,6 +73,7 @@
 </class>
 <class name="R.attr"
  extends="java.lang.Object"
+ interface="false"
  abstract="false"
  static="false"
  final="true"
@@ -85,6 +89,7 @@
 </class>
 <class name="R.drawable"
  extends="java.lang.Object"
+ interface="false"
  abstract="false"
  static="false"
  final="true"
@@ -110,6 +115,7 @@
 </class>
 <class name="R"
  extends="java.lang.Object"
+ interface="false"
  abstract="false"
  static="false"
  final="true"
@@ -125,6 +131,7 @@
 </class>
 <class name="Test"
  extends="android.app.Activity"
+ interface="false"
  abstract="false"
  static="false"
  final="false"

test/dexdump/checkers.xml

diff --git a/test/dexdump/checkers.xml b/test/dexdump/checkers.xml
index 232254f..4e56ea2 100755
--- a/test/dexdump/checkers.xml
+++ b/test/dexdump/checkers.xml
@@ -3,6 +3,7 @@
 >
 <class name="Checkers"
  extends="android.app.Activity"
+ interface="false"
  abstract="false"
  static="false"
  final="false"
@@ -112,6 +113,7 @@
 </class>
 <class name="CheckersView"
  extends="android.view.View"
+ interface="false"
  abstract="false"
  static="false"
  final="false"
@@ -331,6 +333,7 @@
 </class>
 <class name="a"
  extends="java.lang.Thread"
+ interface="false"
  abstract="false"
  static="false"
  final="true"
@@ -500,6 +503,7 @@
 </class>
 <class name="g"
  extends="java.lang.Object"
+ interface="false"
  abstract="false"
  static="false"
  final="true"

test/dexdump/staticfields.xml

diff --git a/test/dexdump/staticfields.xml b/test/dexdump/staticfields.xml
index 6cff71b..c906f0a 100644
--- a/test/dexdump/staticfields.xml
+++ b/test/dexdump/staticfields.xml
@@ -3,6 +3,7 @@
 >
 <class name="StaticFields"
  extends="java.lang.Object"
+ interface="false"
  abstract="false"
  static="false"
  final="false"