Make android_aar_prebuilt() aware of remaining features

build/android/gyp/aar.py

Index: build/android/gyp/aar.py
diff --git a/build/android/gyp/aar.py b/build/android/gyp/aar.py
index 503f9e56a15591cf795bda3f1b61b86124d4d960..f6ebac43d66b09aeab9a3782f5470826c3dad5ef 100755
--- a/build/android/gyp/aar.py
+++ b/build/android/gyp/aar.py
@@ -8,8 +8,11 @@
 
 import argparse
 import os
+import posixpath
+import re
 import shutil
 import sys
+from xml.etree import ElementTree
 import zipfile
 
 from util import build_utils
@@ -19,6 +22,22 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),
 import gn_helpers
 
 
+def _IsManifestEmpty(manifest_str):
+  """Returns whether the given manifest has merge-worthy elements.
+
+  E.g.: <activity>, <service>, etc.
+  """
+  doc = ElementTree.fromstring(manifest_str)
+  for node in doc:
+    if node.tag == 'application':
+      if len(node):
+        return False
+    elif node.tag != 'uses-sdk':
+      return False
+
+  return True
+
+
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('--input-file',
@@ -50,14 +69,36 @@ def main():
 
   if args.list:
     data = {}
+    data['assets'] = []
     data['resources'] = []
-    data['jars'] = []
+    data['subjars'] = []
+    data['subjar_labels'] = []
+    data['has_classes_jar'] = False
+    data['has_proguard_flags'] = False
+    data['has_native_libraries'] = False
     with zipfile.ZipFile(aar_file) as z:
+      data['is_manifest_empty'] = (
+          _IsManifestEmpty(z.read('AndroidManifest.xml')))
+
       for name in z.namelist():
-        if name.startswith('res/') and not name.endswith('/'):
+        if name.endswith('/'):
+          continue
+        if name.startswith('res/'):
           data['resources'].append(name)
-        if name.endswith('.jar'):
-          data['jars'].append(name)
+        elif name.startswith('libs/') and name.endswith('.jar'):
+          label = posixpath.basename(name)[:-4]
+          label = re.sub(r'[^a-zA-Z0-9._]', '_', label)
+          data['subjars'].append(name)

[Ian Wen, 2016/09/06 19:09:59]

One way to simplify the code a bit, is to still use jars as a unified  list for
both classes.jar and other jars. jar_labels will still be needed and its first
entry will be "classes.jar".

WDYT?

[agrieve, 2016/09/06 21:00:51]

I originally separated this from the main classes.jar because I thought I could
make these sub-jars not a part of the main java_group(). That turned out to be
false, so we definitely could return this to be grouped with the others.

However, I think I like having it split out anyways, since it then more closely
matches the structure of the .aar, and allows us to specify fewer arguments on
the sub-jars (e.g. input_jars_paths, proguard_configs).

[Ian Wen, 2016/09/06 21:38:34]

Okay sg. :)

+          data['subjar_labels'].append(label)
+        elif name.startswith('assets/'):
+          data['assets'].append(name)
+        elif name.startswith('jni/'):
+          data['has_native_libraries'] = True

[Ian Wen, 2016/09/06 19:09:59]

Instead of outputting a boolean, have you considered outputting a list of SO
files directly? Later you could check whether the list is empty to determine if
native libraries are there.

[agrieve, 2016/09/06 21:00:51]

I did consider it. The tricky bit is that the there's an architecture directory
(arm, arm64, etc) within jni, so having the full list of .so files isn't really
what you want. In the end I don't think we ever want to support (famous last
words) .so files in .aars, since we want to keep chrome a single .so for speed
reasons, so a boolean is best for now.

[Ian Wen, 2016/09/06 21:38:34]

Hmm if we are not going to support native libraries in AAR, maybe we should
simply make it not supported by default, and don't add the
"ignore_native_libraries" as argument? I feel it's strange to have a parameter
that does nothing in the end.

[agrieve, 2016/09/07 02:19:30]

Much of the motivation behind these flags is that I don't want people to think
that their .aar files are working properly when infact things are being omitted.
By forcing .aars that have .so files to hit an assert and add a flag, it informs
the developer that the .so even exists, and also forces the GN code to be
documents as "there is an .so in here that is not being used".

+        elif name == 'classes.jar':
+          data['has_classes_jar'] = True
+        elif name == 'proguard.txt':
+          data['has_proguard_flags'] = True

[Ian Wen, 2016/09/06 19:09:59]

How about AIDLs and annotations?

AIDLs are included in support v4, yet we don't seem to need it right now. For
annotations, will we ever need it? It seems annotations are there to ensure
android-style enums.

[agrieve, 2016/09/06 21:00:51]

Was going by the list here:
http://tools.android.com/tech-docs/new-build-system/aar-format
which doesn't mention .aidl!

I do indeed see some with v4 support though! Nice find!

Update to look for them as well.

As for annotations: just filed http://crbug.com/644442 to mention that they are
a thing.

+
     print gn_helpers.ToGNString(data)