Commit 6508d420 authored by Ben Joyce's avatar Ben Joyce Committed by Commit Bot

Add androidx uiautomator.

Bug: 896755
Change-Id: If714651fa1a4fa0fadf78f106f22d25f6eb9d13d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1789428Reviewed-by: default avatarJochen Eisinger <jochen@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarChris Palmer <palmer@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#698682}
parent 1311953b
......@@ -2087,6 +2087,17 @@ deps = {
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/androidx_test_uiautomator_uiautomator': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/androidx_test_uiautomator_uiautomator',
'version': 'version:2.2.0-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/androidx_transition_transition': {
'packages': [
{
......
......@@ -471,6 +471,16 @@ android_aar_prebuilt("androidx_test_runner_java") {
]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("androidx_test_uiautomator_uiautomator_java") {
aar_path = "libs/androidx_test_uiautomator_uiautomator/uiautomator-2.2.0.aar"
info_path = "libs/androidx_test_uiautomator_uiautomator/androidx_test_uiautomator_uiautomator.info"
testonly = true
deps = [
":androidx_test_runner_java",
]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("androidx_viewpager_viewpager_java") {
aar_path = "libs/androidx_viewpager_viewpager/viewpager-1.0.0.aar"
......
......@@ -52,6 +52,7 @@
"libs/androidx_test_monitor",
"libs/androidx_test_rules",
"libs/androidx_test_runner",
"libs/androidx_test_uiautomator_uiautomator",
"libs/androidx_transition_transition",
"libs/androidx_vectordrawable_vectordrawable",
"libs/androidx_vectordrawable_vectordrawable_animated",
......
file://third_party/android_deps/OWNERS
\ No newline at end of file
Name: AndroidX Test Library
Short Name: uiautomator
URL: https://developer.android.com/testing
Version: 2.2.0
License: Apache Version 2.0
License File: NOT_SHIPPED
Security Critical: no
Description:
The AndroidX Test Library provides an extensive framework for testing Android apps
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 = true
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:2.2.0-cr0
package: chromium/third_party/android_deps/libs/androidx_test_uiautomator_uiautomator
description: "AndroidX Test Library"
data:
- file: uiautomator-2.2.0.aar
......@@ -133,6 +133,7 @@ dependencies {
testCompile "androidx.test:rules:1.1.0"
testCompile "androidx.test:runner:1.1.0"
testCompile "androidx.test.ext:junit:1.0.0"
testCompile "androidx.test.uiautomator:uiautomator:2.2.0"
}
task setUpRepository(type: BuildConfigGenerator) {
......
......@@ -250,6 +250,9 @@ class BuildConfigGenerator extends DefaultTask {
// Target has AIDL, but we don't support it yet: http://crbug.com/644439
sb.append(' ignore_aidl = true\n')
break
case 'androidx_test_uiautomator_uiautomator':
sb.append(' deps = [":androidx_test_runner_java"]\n')
break
case 'com_android_support_mediarouter_v7':
sb.append(' # https://crbug.com/1000382\n')
sb.append(' proguard_configs = ["support_mediarouter.flags"]\n')
......
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