Commit a0c9fe7f authored by Sam Maier's avatar Sam Maier Committed by Commit Bot

Adding androidx.window to android_deps

Also fixes warning in android_deps where buildCompile or test targets were
triggering vulnerability errors when they aren't shipped.

androidx.window is being added to implement Web APIs related to dual screen
and foldable devices. See:
https://groups.google.com/a/chromium.org/g/blink-dev/c/_1_ljYsaqrU/m/qOoHJ7MhAgAJ

TBR: OWNERS check broken for new android_deps OWNERS file
Change-Id: I350a1f464be2ecb0111004c89aaa87477c7e7e96
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2354599
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798709}
parent 9542f0c5
......@@ -2433,6 +2433,17 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/androidx_window_window': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/androidx_window_window',
'version': 'version:1.0.0-alpha01-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/backport_util_concurrent_backport_util_concurrent': {
'packages': [
{
......
......@@ -801,6 +801,16 @@ android_aar_prebuilt("androidx_webkit_webkit_java") {
visibility = [ "//android_webview/tools/system_webview_shell:*" ]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("androidx_window_window_java") {
aar_path = "libs/androidx_window_window/window-1.0.0-alpha01.aar"
info_path = "libs/androidx_window_window/androidx_window_window.info"
deps = [
":androidx_annotation_annotation_java",
":androidx_core_core_java",
]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_android_support_appcompat_v7_java") {
aar_path = "libs/com_android_support_appcompat_v7/appcompat-v7-28.0.0.aar"
......
......@@ -75,6 +75,7 @@
"libs/androidx_viewpager2_viewpager2",
"libs/androidx_viewpager_viewpager",
"libs/androidx_webkit_webkit",
"libs/androidx_window_window",
"libs/backport_util_concurrent_backport_util_concurrent",
"libs/classworlds_classworlds",
"libs/com_android_support_animated_vector_drawable",
......
......@@ -28,6 +28,13 @@ dependencyCheck {
// Any known vulnerability of any severity will cause the build to fail.
failBuildOnCVSS = 0
suppressionFile = file("vulnerability_supressions.xml")
// Libraries used in these configurations aren't shipped in Chrome.
// They are only used to aid in compiling or testing.
skipConfigurations = [
"buildCompile",
"androidTestCompile",
"testCompile"
]
}
dependencies {
......@@ -75,6 +82,7 @@ dependencies {
compile "androidx.vectordrawable:vectordrawable-animated:${androidXSupportLibVersion}"
compile "androidx.tvprovider:tvprovider:${androidXSupportLibVersion}"
compile "androidx.viewpager:viewpager:${androidXSupportLibVersion}"
compile "androidx.window:window:1.0.0-alpha01"
compile "androidx.exifinterface:exifinterface:${androidXSupportLibVersion}"
// Those are for use by doubledown material design
......
This diff is collapsed.
file://third_party/android_deps/OWNERS
\ No newline at end of file
Name: Jetpack WindowManager Library
Short Name: window
URL: https://developer.android.com/jetpack/androidx
Version: 1.0.0-alpha01
License: Apache Version 2.0
License File: LICENSE
Security Critical: yes
Description:
WindowManager Jetpack library. Currently only provides additional functionality on foldable devices.
Local Modifications:
No modifications.
# 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 = false
has_r_text_file = false
is_manifest_empty = false
manifest_package = "androidx.window"
resources = []
subjar_tuples = []
subjars = []
# Copyright 2018 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# To create CIPD package run the following command.
# cipd create --pkg-def cipd.yaml -tag version:1.0.0-alpha01-cr0
package: chromium/third_party/android_deps/libs/androidx_window_window
description: "Jetpack WindowManager Library"
data:
- file: window-1.0.0-alpha01.aar
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment