commit 38eb39df6825f6ac4a8fe4f08ecbe4fc8d2dac1e
author Googler <noreply@google.com> Sat Oct 10 00:51:33 2015 +0000
committer Han-Wen Nienhuys <hanwen@google.com> Mon Oct 12 08:36:24 2015 +0000
tree 54aad1d5f68a857a317b475108da5d9d8070e392
parent 00ef6615d72104cd69234d96733cb11abe534035

The <use-permission-sdk-23> tag is not merged into final manifest

Now in the android_manifest_merge rule, the newly introduced <use-permission-sdk-23> tag
is not merged.

--
MOS_MIGRATED_REVID=105104945

tools/android/merge_manifests.py

diff --git a/tools/android/merge_manifests.py b/tools/android/merge_manifests.py
index 4ef6a63..6c3af21 100644
--- a/tools/android/merge_manifests.py
+++ b/tools/android/merge_manifests.py
@@ -75,11 +75,13 @@
   _INTENT_FILTER = 'intent-filter'
   _MANIFEST = 'manifest'
   _USES_PERMISSION = 'uses-permission'
+  _USES_PERMISSION_SDK_23 = 'uses-permission-sdk-23'
   _NODES_TO_COPY_FROM_MERGEE = {
       _MANIFEST: [
           'instrumentation',
           'permission',
           _USES_PERMISSION,
+          _USES_PERMISSION_SDK_23,
           'uses-feature',
           'permission-group',
           ],
@@ -118,7 +120,8 @@
     """
     if self._exclude_permissions:
       exclude_all_permissions = EXCLUDE_ALL_ARG in self._exclude_permissions
-      for element in dom.getElementsByTagName(self._USES_PERMISSION):
+      for element in (dom.getElementsByTagName(self._USES_PERMISSION) +
+       dom.getElementsByTagName(self._USES_PERMISSION_SDK_23)):
         if element.hasAttribute(self._ANDROID_NAME):
           attrib = element.getAttribute(self._ANDROID_NAME)
           if exclude_all_permissions or attrib in self._exclude_permissions: