[android] Support building with the O support library.

Bug: 721157
Change-Id: I1aaf8ddeb0361b6680cf68729d32a80ff55c8c01
Reviewed-on: https://chromium-review.googlesource.com/502629
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Theresa Wellington <twellington@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#473328}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 81658adf391904c643f2db3fa2395b180dea5a72

config/android/rules.gni

@@ -2873,7 +2873,10 @@ if (enable_java_templates) {
         }
         deps += [ ":$_unpack_target_name" ]
         resource_dirs = []
-        generated_resource_dirs = [ "${_output_path}/res" ]
+        generated_resource_dirs = []
+        if (_scanned_files.resources != []) {
+          generated_resource_dirs += [ "${_output_path}/res" ]
+        }
         generated_resource_files =
             rebase_path(_scanned_files.resources, "", _output_path)
         android_manifest_dep = ":$_unpack_target_name"

secondary/third_party/android_tools/BUILD.gn

@@ -56,6 +56,7 @@ android_aar_prebuilt("android_support_design_java") {
   ]
   _lib_name = "design"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_transition_java") {
@@ -64,6 +65,7 @@ android_aar_prebuilt("android_support_transition_java") {
   ]
   _lib_name = "transition"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_multidex_java") {
@@ -89,27 +91,32 @@ android_aar_prebuilt("android_support_compat_java") {
   _lib_name = "support-compat"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
   ignore_aidl = true  # We don't appear to need these currently.
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_core_ui_java") {
   _lib_name = "support-core-ui"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_core_utils_java") {
   _lib_name = "support-core-utils"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_fragment_java") {
   _lib_name = "support-fragment"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_media_compat_java") {
   _lib_name = "support-media-compat"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
   ignore_aidl = true  # We don't appear to need these currently.
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v13_java") {
@@ -119,16 +126,19 @@ android_aar_prebuilt("android_support_v13_java") {
   ]
   _lib_name = "support-v13"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_vector_drawable_java") {
   _lib_name = "support-vector-drawable"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v7_appcompat_java_internal") {
   _lib_name = "appcompat-v7"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 java_group("android_support_v7_appcompat_java") {
@@ -145,6 +155,7 @@ android_aar_prebuilt("android_support_v7_gridlayout_java") {
   ]
   _lib_name = "gridlayout-v7"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v7_mediarouter_java") {
@@ -153,6 +164,7 @@ android_aar_prebuilt("android_support_v7_mediarouter_java") {
   ]
   _lib_name = "mediarouter-v7"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v7_recyclerview_java") {
@@ -161,6 +173,7 @@ android_aar_prebuilt("android_support_v7_recyclerview_java") {
   ]
   _lib_name = "recyclerview-v7"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v7_preference_java") {
@@ -169,6 +182,7 @@ android_aar_prebuilt("android_support_v7_preference_java") {
   ]
   _lib_name = "preference-v7"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v14_preference_java") {
@@ -177,6 +191,7 @@ android_aar_prebuilt("android_support_v14_preference_java") {
   ]
   _lib_name = "preference-v14"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v17_leanback_java") {
@@ -186,6 +201,7 @@ android_aar_prebuilt("android_support_v17_leanback_java") {
   ]
   _lib_name = "leanback-v17"
   aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  ignore_manifest = true
 }
 
 android_aar_prebuilt("android_support_v17_preference_java") {