📱 Roll android support library to 27.0.0

This patch adds dependencies on the architecture components
to a few of our build targets.

For support library patch notes, see
https://developer.android.com/topic/libraries/support-library/rev-archive.html#25-1-0
and https://developer.android.com/topic/libraries/support-library/revisions.html
(we moved from 25.0.1 to 27.0.0)


TBR=lambroslambrou@chromium.org

Bug: 769683
Change-Id: Ib7c23043aee0b2e699df12a58e646a8035e8666e
Reviewed-on: https://chromium-review.googlesource.com/692894
Commit-Queue: Nicolas Dossou-Gbété <dgn@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512479}

DEPS

@@ -222,7 +222,7 @@ deps = {
   },
 
   'src/third_party/android_tools': {
-      'url': Var('chromium_git') + '/android_tools.git' + '@' + '110e5f6c0dcb6f7d586ac0c00f10bc7d1d410088',
+      'url': Var('chromium_git') + '/android_tools.git' + '@' + 'ca0bd083872ad925881736fe2bedc3ff855e08f5',
       'condition': 'checkout_android',
   },
 

build/secondary/third_party/android_tools/BUILD.gn

@@ -46,8 +46,9 @@ support_lib_alias("android_gcm_java") {
 }
 support_lib_alias("emma_device_java") {
 }
-java_group("android_arch_lifecycle_common_java") {
-  # TODO(https://crbug.com/769683): Define when rolling to support lib 26+.
+support_lib_alias("android_arch_lifecycle_common_java") {
+}
+support_lib_alias("android_arch_lifecycle_runtime_java") {
 }
 support_lib_alias("android_support_multidex_java") {
 }

build/secondary/third_party/android_tools/support/BUILD.gn

@@ -9,8 +9,11 @@ visibility = [
   "//third_party/android_tools:*",
 ]
 
-lib_version = "25.0.1"
+lib_version = "27.0.0"
 lib_path = "//third_party/android_tools/sdk/extras/android/m2repository/com/android/support"
+arch_lib_version = "1.0.0"
+arch_lib_path =
+    "//third_party/android_tools/sdk/extras/android/m2repository/android/arch"
 build_file_dir = "//build/secondary/third_party/android_tools/support"
 
 android_library("android_support_chromium_java") {
@@ -62,6 +65,32 @@ android_aar_prebuilt("android_support_multidex_java") {
   info_path = "$build_file_dir/$target_name.info"
 }
 
+android_aar_prebuilt("android_arch_lifecycle_runtime_java") {
+  aar_path = "$arch_lib_path/lifecycle/runtime/$arch_lib_version/runtime-$arch_lib_version.aar"
+  info_path = "$build_file_dir/$target_name.info"
+  deps = [
+    ":android_arch_core_common_java",
+    ":android_arch_lifecycle_common_java",
+    ":android_support_annotations_java",
+  ]
+}
+
+android_java_prebuilt("android_arch_lifecycle_common_java") {
+  output_name = "arch_lifecycle_common"
+  jar_path = "$arch_lib_path/lifecycle/common/$arch_lib_version/common-$arch_lib_version.jar"
+  deps = [
+    ":android_support_annotations_java",
+  ]
+}
+
+android_java_prebuilt("android_arch_core_common_java") {
+  output_name = "arch_core_common"
+  jar_path = "$arch_lib_path/core/common/$arch_lib_version/common-$arch_lib_version.jar"
+  deps = [
+    ":android_support_annotations_java",
+  ]
+}
+
 android_java_prebuilt("android_support_annotations_java") {
   _lib_name = "support-annotations"
   jar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.jar"
@@ -79,6 +108,7 @@ java_group("android_support_v4_java") {
 
 android_aar_prebuilt("android_support_compat_java") {
   deps = [
+    ":android_arch_lifecycle_runtime_java",
     ":android_support_annotations_java",
   ]
   _lib_name = "support-compat"
@@ -145,6 +175,16 @@ android_aar_prebuilt("android_support_vector_drawable_java") {
   info_path = "$build_file_dir/$target_name.info"
 }
 
+android_aar_prebuilt("android_support_animated_vector_drawable_java") {
+  deps = [
+    ":android_support_core_ui_java",
+    ":android_support_vector_drawable_java",
+  ]
+  _lib_name = "animated-vector-drawable"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
+  info_path = "$build_file_dir/$target_name.info"
+}
+
 android_aar_prebuilt("android_support_v7_appcompat_java_internal") {
   deps = [
     ":android_support_v4_java",
@@ -156,6 +196,7 @@ android_aar_prebuilt("android_support_v7_appcompat_java_internal") {
 
 java_group("android_support_v7_appcompat_java") {
   deps = [
+    ":android_support_animated_vector_drawable_java",
     ":android_support_v4_java",
     ":android_support_v7_appcompat_java_internal",
     ":android_support_vector_drawable_java",

build/secondary/third_party/android_tools/support/android_arch_lifecycle_runtime_java.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = [  ]
+assets = [  ]
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = true
+has_r_text_file = false
+is_manifest_empty = false
+resources = [  ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_animated_vector_drawable_java.info

+# Generated by //build/android/gyp/aar.py
+# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
+
+aidl = [  ]
+assets = [  ]
+has_classes_jar = true
+has_native_libraries = false
+has_proguard_flags = true
+has_r_text_file = true
+is_manifest_empty = true
+resources = [  ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_compat_java.info

@@ -6,8 +6,8 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
-resources = [  ]
-subjar_tuples = [ [ "internal_impl_25.0.1", "libs/internal_impl-25.0.1.jar" ] ]
-subjars = [ "libs/internal_impl-25.0.1.jar" ]
+resources = [ "res/values-ur/values-ur.xml", "res/values-ru/values-ru.xml", "res/values-en-rGB/values-en-rGB.xml", "res/values-pt-rBR/values-pt-rBR.xml", "res/values-el/values-el.xml", "res/drawable-hdpi-v4/notification_bg_low_normal.9.png", "res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png", "res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png", "res/drawable-hdpi-v4/notification_bg_normal.9.png", "res/drawable-hdpi-v4/notification_bg_low_pressed.9.png", "res/values-tr/values-tr.xml", "res/values-hu/values-hu.xml", "res/values-km/values-km.xml", "res/values-fr-rCA/values-fr-rCA.xml", "res/values-gu/values-gu.xml", "res/layout/notification_template_icon_group.xml", "res/layout/notification_template_custom_big.xml", "res/layout/notification_template_part_time.xml", "res/layout/notification_template_part_chronometer.xml", "res/layout/notification_action_tombstone.xml", "res/layout/notification_action.xml", "res/values-ms/values-ms.xml", "res/values-v21/values-v21.xml", "res/values-ja/values-ja.xml", "res/values-eu/values-eu.xml", "res/values-sv/values-sv.xml", "res/values-mn/values-mn.xml", "res/layout-v16/notification_template_custom_big.xml", "res/values-ta/values-ta.xml", "res/values-pl/values-pl.xml", "res/values-lt/values-lt.xml", "res/values-bg/values-bg.xml", "res/values-es-rUS/values-es-rUS.xml", "res/values-iw/values-iw.xml", "res/values-mr/values-mr.xml", "res/values-uz/values-uz.xml", "res/values-pa/values-pa.xml", "res/values-fi/values-fi.xml", "res/values-am/values-am.xml", "res/values-pt-rPT/values-pt-rPT.xml", "res/values-ar/values-ar.xml", "res/values-ky/values-ky.xml", "res/drawable-mdpi-v4/notification_bg_low_normal.9.png", "res/drawable-mdpi-v4/notify_panel_notification_icon_bg.png", "res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png", "res/drawable-mdpi-v4/notification_bg_normal.9.png", "res/drawable-mdpi-v4/notification_bg_low_pressed.9.png", "res/values-bs/values-bs.xml", "res/values/values.xml", "res/values-hr/values-hr.xml", "res/values-en-rAU/values-en-rAU.xml", "res/values-ro/values-ro.xml", "res/drawable-xhdpi-v4/notification_bg_low_normal.9.png", "res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png", "res/drawable-xhdpi-v4/notification_bg_normal_pressed.9.png", "res/drawable-xhdpi-v4/notification_bg_normal.9.png", "res/drawable-xhdpi-v4/notification_bg_low_pressed.9.png", "res/values-vi/values-vi.xml", "res/values-ko/values-ko.xml", "res/values-zh-rTW/values-zh-rTW.xml", "res/values-cs/values-cs.xml", "res/values-ml/values-ml.xml", "res/values-te/values-te.xml", "res/values-si/values-si.xml", "res/values-es/values-es.xml", "res/values-af/values-af.xml", "res/values-zu/values-zu.xml", "res/values-lo/values-lo.xml", "res/values-mk/values-mk.xml", "res/values-sl/values-sl.xml", "res/values-sw/values-sw.xml", "res/values-bn/values-bn.xml", "res/values-sk/values-sk.xml", "res/values-lv/values-lv.xml", "res/values-is/values-is.xml", "res/values-da/values-da.xml", "res/values-it/values-it.xml", "res/values-gl/values-gl.xml", "res/values-de/values-de.xml", "res/values-be/values-be.xml", "res/values-fa/values-fa.xml", "res/values-ca/values-ca.xml", "res/values-th/values-th.xml", "res/values-nl/values-nl.xml", "res/values-hy/values-hy.xml", "res/values-zh-rHK/values-zh-rHK.xml", "res/values-tl/values-tl.xml", "res/values-kk/values-kk.xml", "res/values-pt/values-pt.xml", "res/values-my/values-my.xml", "res/values-et/values-et.xml", "res/values-en-rIN/values-en-rIN.xml", "res/values-sr/values-sr.xml", "res/values-v16/values-v16.xml", "res/values-fr/values-fr.xml", "res/values-kn/values-kn.xml", "res/values-nb/values-nb.xml", "res/values-port/values-port.xml", "res/values-ne/values-ne.xml", "res/drawable/notification_bg_low.xml", "res/drawable/notification_bg.xml", "res/drawable/notification_icon_background.xml", "res/drawable/notification_tile_bg.xml", "res/values-b+sr+Latn/values-b+sr+Latn.xml", "res/values-ka/values-ka.xml", "res/values-zh-rCN/values-zh-rCN.xml", "res/values-az/values-az.xml", "res/values-sq/values-sq.xml", "res/values-hi/values-hi.xml", "res/layout-v21/notification_template_icon_group.xml", "res/layout-v21/notification_template_custom_big.xml", "res/layout-v21/notification_action_tombstone.xml", "res/layout-v21/notification_action.xml", "res/values-in/values-in.xml", "res/values-uk/values-uk.xml", "res/drawable-v21/notification_action_background.xml" ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_core_ui_java.info

@@ -6,8 +6,8 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = true
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 resources = [  ]
-subjar_tuples = [ [ "internal_impl_25.0.1", "libs/internal_impl-25.0.1.jar" ] ]
-subjars = [ "libs/internal_impl-25.0.1.jar" ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_core_utils_java.info

@@ -6,8 +6,8 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 resources = [  ]
-subjar_tuples = [ [ "internal_impl_25.0.1", "libs/internal_impl-25.0.1.jar" ] ]
-subjars = [ "libs/internal_impl-25.0.1.jar" ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_design_java.info

@@ -8,6 +8,6 @@ has_native_libraries = false
 has_proguard_flags = true
 has_r_text_file = true
 is_manifest_empty = true
-resources = [ "res/drawable-v21/design_bottom_navigation_item_background.xml", "res/values-v21/values-v21.xml", "res/anim-v21/design_bottom_sheet_slide_out.xml", "res/anim-v21/design_appbar_state_list_animator.xml", "res/anim-v21/design_bottom_sheet_slide_in.xml", "res/anim/design_fab_out.xml", "res/anim/design_bottom_sheet_slide_out.xml", "res/anim/design_snackbar_in.xml", "res/anim/design_fab_in.xml", "res/anim/design_snackbar_out.xml", "res/anim/design_bottom_sheet_slide_in.xml", "res/layout/design_layout_tab_text.xml", "res/layout/design_navigation_item_separator.xml", "res/layout/design_bottom_sheet_dialog.xml", "res/layout/design_layout_snackbar_include.xml", "res/layout/design_text_input_password_icon.xml", "res/layout/design_navigation_menu_item.xml", "res/layout/design_menu_item_action_area.xml", "res/layout/design_navigation_item.xml", "res/layout/design_navigation_item_header.xml", "res/layout/design_layout_snackbar.xml", "res/layout/design_navigation_item_subheader.xml", "res/layout/design_navigation_menu.xml", "res/layout/design_layout_tab_icon.xml", "res/layout/design_bottom_navigation_item.xml", "res/values-sw600dp-v13/values-sw600dp-v13.xml", "res/values-land/values-land.xml", "res/color-v23/design_tint_password_toggle.xml", "res/values/values.xml", "res/layout-sw600dp-v13/design_layout_snackbar.xml", "res/color/design_error.xml", "res/color/design_tint_password_toggle.xml", "res/drawable/design_snackbar_background.xml", "res/drawable/design_fab_background.xml", "res/drawable/design_bottom_navigation_item_background.xml", "res/drawable/design_ic_visibility.xml", "res/drawable/navigation_empty_icon.xml" ]
+resources = [ "res/drawable-hdpi-v4/design_ic_visibility.png", "res/drawable-hdpi-v4/design_ic_visibility_off.png", "res/layout/design_bottom_sheet_dialog.xml", "res/layout/design_layout_tab_text.xml", "res/layout/design_bottom_navigation_item.xml", "res/layout/design_navigation_item.xml", "res/layout/design_layout_snackbar_include.xml", "res/layout/design_navigation_menu.xml", "res/layout/design_navigation_item_header.xml", "res/layout/design_navigation_item_separator.xml", "res/layout/design_layout_snackbar.xml", "res/layout/design_text_input_password_icon.xml", "res/layout/design_layout_tab_icon.xml", "res/layout/design_navigation_item_subheader.xml", "res/layout/design_menu_item_action_area.xml", "res/layout/design_navigation_menu_item.xml", "res/values-v21/values-v21.xml", "res/drawable-anydpi-v21/design_ic_visibility.xml", "res/drawable-anydpi-v21/design_ic_visibility_off.xml", "res/layout-sw600dp-v13/design_layout_snackbar.xml", "res/drawable-xxhdpi-v4/design_ic_visibility.png", "res/drawable-xxhdpi-v4/design_ic_visibility_off.png", "res/color/design_error.xml", "res/color/design_tint_password_toggle.xml", "res/animator-v21/design_appbar_state_list_animator.xml", "res/drawable-mdpi-v4/design_ic_visibility.png", "res/drawable-mdpi-v4/design_ic_visibility_off.png", "res/values/values.xml", "res/drawable-xhdpi-v4/design_ic_visibility.png", "res/drawable-xhdpi-v4/design_ic_visibility_off.png", "res/values-land/values-land.xml", "res/values-sw600dp-v13/values-sw600dp-v13.xml", "res/anim/design_snackbar_out.xml", "res/anim/design_snackbar_in.xml", "res/anim/design_bottom_sheet_slide_out.xml", "res/anim/design_bottom_sheet_slide_in.xml", "res/drawable-xxxhdpi-v4/design_ic_visibility.png", "res/drawable-xxxhdpi-v4/design_ic_visibility_off.png", "res/anim-v21/design_bottom_sheet_slide_out.xml", "res/anim-v21/design_bottom_sheet_slide_in.xml", "res/values-v26/values-v26.xml", "res/color-v23/design_tint_password_toggle.xml", "res/drawable/design_snackbar_background.xml", "res/drawable/design_fab_background.xml", "res/drawable/design_password_eye.xml", "res/drawable/navigation_empty_icon.xml", "res/drawable/design_bottom_navigation_item_background.xml", "res/drawable-v21/avd_hide_password.xml", "res/drawable-v21/avd_show_password.xml", "res/drawable-v21/design_password_eye.xml", "res/drawable-v21/design_bottom_navigation_item_background.xml" ]
 subjar_tuples = [  ]
 subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_fragment_java.info

@@ -6,8 +6,8 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 resources = [  ]
-subjar_tuples = [ [ "internal_impl_25.0.1", "libs/internal_impl-25.0.1.jar" ] ]
-subjars = [ "libs/internal_impl-25.0.1.jar" ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_media_compat_java.info

 # Generated by //build/android/gyp/aar.py
 # To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
 
-aidl = [ "aidl/android/support/v4/media/session/MediaSessionCompat.aidl", "aidl/android/support/v4/media/session/PlaybackStateCompat.aidl", "aidl/android/support/v4/media/session/ParcelableVolumeInfo.aidl", "aidl/android/support/v4/media/RatingCompat.aidl", "aidl/android/support/v4/media/MediaMetadataCompat.aidl" ]
+aidl = [ "aidl/android/support/v4/media/session/PlaybackStateCompat.aidl", "aidl/android/support/v4/media/session/MediaSessionCompat.aidl", "aidl/android/support/v4/media/session/ParcelableVolumeInfo.aidl", "aidl/android/support/v4/media/RatingCompat.aidl", "aidl/android/support/v4/media/MediaMetadataCompat.aidl", "aidl/android/support/v4/media/MediaDescriptionCompat.aidl" ]
 assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
-has_proguard_flags = false
-has_r_text_file = false
+has_proguard_flags = true
+has_r_text_file = true
 is_manifest_empty = true
-resources = [  ]
-subjar_tuples = [ [ "internal_impl_25.0.1", "libs/internal_impl-25.0.1.jar" ] ]
-subjars = [ "libs/internal_impl-25.0.1.jar" ]
+resources = [ "res/layout/notification_template_media_custom.xml", "res/layout/notification_template_big_media_narrow_custom.xml", "res/layout/notification_template_media.xml", "res/layout/notification_template_big_media.xml", "res/layout/notification_media_action.xml", "res/layout/notification_template_lines_media.xml", "res/layout/notification_media_cancel_action.xml", "res/layout/notification_template_big_media_custom.xml", "res/layout/notification_template_big_media_narrow.xml", "res/values-v21/values-v21.xml", "res/values/values.xml", "res/values-v24/values-v24.xml" ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_transition_java.info

@@ -5,7 +5,7 @@ aidl = [  ]
 assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
-has_proguard_flags = false
+has_proguard_flags = true
 has_r_text_file = true
 is_manifest_empty = true
 resources = [ "res/values/values.xml" ]

build/secondary/third_party/android_tools/support/android_support_v13_java.info

@@ -6,8 +6,8 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 resources = [  ]
-subjar_tuples = [ [ "internal_impl_25.0.1", "libs/internal_impl-25.0.1.jar" ] ]
-subjars = [ "libs/internal_impl-25.0.1.jar" ]
+subjar_tuples = [  ]
+subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_v14_preference_java.info

@@ -8,6 +8,6 @@ has_native_libraries = false
 has_proguard_flags = false
 has_r_text_file = true
 is_manifest_empty = true
-resources = [ "res/layout-v17/preference_material.xml", "res/layout-v17/preference_information_material.xml", "res/layout-v17/preference_category_material.xml", "res/layout-v17/preference_dropdown_material.xml", "res/values-v17/values-v17.xml", "res/layout/preference_material.xml", "res/layout/preference_information_material.xml", "res/layout/preference_category_material.xml", "res/layout/preference_dropdown_material.xml", "res/layout/preference_widget_switch.xml", "res/values/values.xml", "res/layout-v21/preference_material.xml", "res/layout-v21/preference_information_material.xml", "res/layout-v21/preference_category_material.xml", "res/layout-v21/preference_dropdown_material.xml", "res/drawable/preference_list_divider_material.xml" ]
+resources = [ "res/layout/preference_information_material.xml", "res/layout/preference_widget_seekbar_material.xml", "res/layout/preference_category_material.xml", "res/layout/preference_dropdown_material.xml", "res/layout/preference_widget_switch.xml", "res/layout/preference_material.xml", "res/values/values.xml", "res/values-v17/values-v17.xml", "res/drawable/preference_list_divider_material.xml", "res/layout-v21/preference_information_material.xml", "res/layout-v21/preference_category_material.xml", "res/layout-v21/preference_dropdown_material.xml", "res/layout-v21/preference_material.xml", "res/drawable-v21/preference_list_divider_material.xml", "res/layout-v17/preference_information_material.xml", "res/layout-v17/preference_category_material.xml", "res/layout-v17/preference_dropdown_material.xml", "res/layout-v17/preference_material.xml" ]
 subjar_tuples = [  ]
 subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_v17_preference_java.info

@@ -8,6 +8,6 @@ has_native_libraries = false
 has_proguard_flags = false
 has_r_text_file = true
 is_manifest_empty = true
-resources = [ "res/layout/leanback_preference_category.xml", "res/layout/leanback_list_preference_item_single.xml", "res/layout/leanback_list_preference_fragment.xml", "res/layout/leanback_list_preference_item_multi.xml", "res/layout/leanback_settings_fragment.xml", "res/layout/leanback_preference_fragment.xml", "res/layout/leanback_preferences_list.xml", "res/layout/leanback_preference_information.xml", "res/layout/leanback_preference.xml", "res/values/values.xml", "res/layout-v21/leanback_settings_fragment.xml", "res/color/lb_preference_item_secondary_text_color.xml", "res/color/lb_preference_item_primary_text_color.xml" ]
+resources = [ "res/layout/leanback_preference_widget_seekbar.xml", "res/layout/leanback_preference_information.xml", "res/layout/leanback_preference.xml", "res/layout/leanback_preferences_list.xml", "res/layout/leanback_settings_fragment.xml", "res/layout/leanback_list_preference_item_single.xml", "res/layout/leanback_preference_category.xml", "res/layout/leanback_list_preference_fragment.xml", "res/layout/leanback_list_preference_item_multi.xml", "res/layout/leanback_preference_fragment.xml", "res/color/lb_preference_item_primary_text_color.xml", "res/color/lb_preference_item_secondary_text_color.xml", "res/values/values.xml", "res/layout-v21/leanback_settings_fragment.xml", "res/layout-v21/leanback_preference_category.xml" ]
 subjar_tuples = [  ]
 subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_v7_palette_java.info

@@ -6,7 +6,7 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 resources = [  ]
 subjar_tuples = [  ]

build/secondary/third_party/android_tools/support/android_support_v7_preference_java.info

@@ -8,6 +8,6 @@ has_native_libraries = false
 has_proguard_flags = true
 has_r_text_file = true
 is_manifest_empty = true
-resources = [ "res/values-v17/values-v17.xml", "res/layout/preference_dropdown.xml", "res/layout/preference_list_fragment.xml", "res/layout/preference.xml", "res/layout/preference_category.xml", "res/layout/preference_widget_checkbox.xml", "res/layout/preference_widget_switch_compat.xml", "res/layout/preference_information.xml", "res/layout/preference_recyclerview.xml", "res/layout/preference_dialog_edittext.xml", "res/values/values.xml", "res/layout-v11/preference_dropdown.xml", "res/layout-v11/preference.xml" ]
+resources = [ "res/layout-v11/preference.xml", "res/layout-v11/preference_dropdown.xml", "res/layout/preference_recyclerview.xml", "res/layout/preference_widget_checkbox.xml", "res/layout/preference_widget_seekbar.xml", "res/layout/preference_widget_switch_compat.xml", "res/layout/preference_list_fragment.xml", "res/layout/preference_dialog_edittext.xml", "res/layout/preference_information.xml", "res/layout/preference_category.xml", "res/values/values.xml", "res/values-v17/values-v17.xml" ]
 subjar_tuples = [  ]
 subjars = [  ]

build/secondary/third_party/android_tools/support/android_support_vector_drawable_java.info

@@ -6,7 +6,7 @@ assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
 has_proguard_flags = false
-has_r_text_file = false
+has_r_text_file = true
 is_manifest_empty = true
 resources = [  ]
 subjar_tuples = [  ]

chrome/android/BUILD.gn

@@ -243,8 +243,11 @@ android_library("chrome_java") {
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_swipe_refresh:android_swipe_refresh_java",
+    "//third_party/android_tools:android_arch_lifecycle_common_java",
+    "//third_party/android_tools:android_arch_lifecycle_runtime_java",
     "//third_party/android_tools:android_gcm_java",
     "//third_party/android_tools:android_support_annotations_java",
+    "//third_party/android_tools:android_support_compat_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_transition_java",
     "//third_party/android_tools:android_support_v13_java",
@@ -422,6 +425,7 @@ junit_binary("chrome_junit_tests") {
     "//third_party/WebKit/public:android_mojo_bindings_java",
     "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
+    "//third_party/android_tools:android_arch_lifecycle_common_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
@@ -531,6 +535,7 @@ android_library("chrome_test_java") {
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/android_tools:android_arch_lifecycle_common_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_transition_java",
@@ -632,6 +637,7 @@ if (enable_vr) {
       "//third_party/android_protobuf:protobuf_nano_javalib",
       "//third_party/android_support_test_runner:rules_java",
       "//third_party/android_support_test_runner:runner_java",
+      "//third_party/android_tools:android_arch_lifecycle_common_java",
       "//third_party/android_tools:android_support_v7_appcompat_java",
       "//third_party/android_tools:android_support_v7_recyclerview_java",
       "//third_party/custom_tabs_client:custom_tabs_support_java",
@@ -1177,6 +1183,7 @@ instrumentation_test_apk("chrome_sync_shell_test_apk") {
     "//content/public/test/android:content_java_test_support",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/android_tools:android_arch_lifecycle_common_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/junit",
     "//ui/android:ui_java",

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

@@ -24,11 +24,11 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.support.annotation.NonNull;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.media.MediaMetadataCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
-import android.support.v7.app.NotificationCompat;
 import android.support.v7.media.MediaRouter;
 import android.text.TextUtils;
 import android.util.SparseArray;

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationCompatBuilder.java

@@ -10,8 +10,8 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v7.app.NotificationCompat;
 import android.widget.RemoteViews;
 
 /**
@@ -206,7 +206,8 @@ public class NotificationCompatBuilder implements ChromeNotificationBuilder {
     @Override
     public ChromeNotificationBuilder setMediaStyle(MediaSessionCompat session, int[] actions,
             PendingIntent intent, boolean showCancelButton) {
-        NotificationCompat.MediaStyle style = new NotificationCompat.MediaStyle();
+        android.support.v4.media.app.NotificationCompat.MediaStyle style =
+                new android.support.v4.media.app.NotificationCompat.MediaStyle();
         style.setMediaSession(session.getSessionToken());
         style.setShowActionsInCompactView(actions);
         style.setCancelButtonIntent(intent);

chrome/test/android/BUILD.gn

@@ -91,6 +91,7 @@ android_library("chrome_java_test_support") {
     "//testing/android/reporter:reporter_java",
     "//third_party/android_support_test_runner:rules_java",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/android_tools:android_arch_lifecycle_common_java",
     "//third_party/android_tools:android_support_compat_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_transition_java",

remoting/android/client_java_tmpl.gni

@@ -80,6 +80,7 @@ template("remoting_android_client_java_tmpl") {
       "//base:base_java",
       "//remoting/android:remoting_android_client_java_resources",
       "//remoting/android:remoting_apk_manifest",
+      "//third_party/android_tools:android_arch_lifecycle_common_java",
       "//third_party/android_tools:android_support_annotations_java",
       "//third_party/android_tools:android_support_compat_java",
       "//third_party/android_tools:android_support_core_ui_java",