Commit de12227c authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Revert "add robolectric_all to android_deps."

This reverts commit f34af30b.

Reason for revert: broke android-pie-arm64-rel

https://ci.chromium.org/p/chromium/builders/try/android-pie-arm64-rel/124453

ERROR at //third_party/android_deps/BUILD.gn:1408:30: Assignment had no effect.
  enable_bytecode_rewriter = false
                             ^----
You set the variable "enable_bytecode_rewriter" here and it was unused before it went
out of scope.
See //third_party/android_deps/BUILD.gn:1404:1: whence it was called.
java_prebuilt("org_robolectric_android_all_java") {
^--------------------------------------------------
See //services/BUILD.gn:106:7: which caused the file to be included.
      "$google_play_services_package:google_play_services_base_java",
      ^-------------------------------------------------------------

Original change's description:
> add robolectric_all to android_deps.
> 
> This is the same file as included in
> 
> https://source.chromium.org/chromium/chromium/src/+/master:third_party/robolectric/cipd.yaml;l=16?originalUrl=https:%2F%2Fcs.chromium.org%2F
> https://source.chromium.org/chromium/chromium/src/+/master:third_party/robolectric/BUILD.gn;l=59?originalUrl=https:%2F%2Fcs.chromium.org%2F
> 
> I'm just moving it to android_deps, so I don't think we need security
> or license review.
> 
> Will remove duplicate file when robolectric moves to android_deps.
> I could possibly remove it now but sdk_texts writes in the location.
> https://source.chromium.org/chromium/chromium/src/+/master:third_party/robolectric/BUILD.gn;l=268?originalUrl=https:%2F%2Fcs.chromium.org%2F
> 
> Bug: 1060721
> Change-Id: I95fd2fc63d652c3b7274753532e6a86081f60a58
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210094
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Commit-Queue: benjamin joyce <bjoyce@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#771084}

TBR=yfriedman@chromium.org,wnwen@chromium.org,agrieve@chromium.org,bjoyce@chromium.org

Change-Id: I0b12781d7df4416d76629c336373ceb608983c87
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1060721
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2212464Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771094}
parent a285f9a2
...@@ -3813,17 +3813,6 @@ deps = { ...@@ -3813,17 +3813,6 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
'src/third_party/android_deps/libs/org_robolectric_android_all': {
'packages': [
{
'package': 'chromium/third_party/android_deps/libs/org_robolectric_android_all',
'version': 'version:10-robolectric-5803371-cr0',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/android_deps/libs/org_robolectric_annotations': { 'src/third_party/android_deps/libs/org_robolectric_annotations': {
'packages': [ 'packages': [
{ {
......
...@@ -1400,16 +1400,6 @@ java_prebuilt("org_ow2_asm_asm_util_java") { ...@@ -1400,16 +1400,6 @@ java_prebuilt("org_ow2_asm_asm_util_java") {
] ]
} }
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("org_robolectric_android_all_java") {
jar_path =
"libs/org_robolectric_android_all/android-all-10-robolectric-5803371.jar"
output_name = "org_robolectric_android_all"
enable_bytecode_rewriter = false
testonly = true
bypass_platform_checks = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("org_robolectric_robolectric_java") { java_prebuilt("org_robolectric_robolectric_java") {
jar_path = "libs/org_robolectric_robolectric/robolectric-4.3.1.jar" jar_path = "libs/org_robolectric_robolectric/robolectric-4.3.1.jar"
......
...@@ -204,7 +204,6 @@ ...@@ -204,7 +204,6 @@
"libs/org_plumelib_plume_util", "libs/org_plumelib_plume_util",
"libs/org_plumelib_reflection_util", "libs/org_plumelib_reflection_util",
"libs/org_plumelib_require_javadoc", "libs/org_plumelib_require_javadoc",
"libs/org_robolectric_android_all",
"libs/org_robolectric_annotations", "libs/org_robolectric_annotations",
"libs/org_robolectric_junit", "libs/org_robolectric_junit",
"libs/org_robolectric_pluginapi", "libs/org_robolectric_pluginapi",
......
...@@ -167,7 +167,6 @@ dependencies { ...@@ -167,7 +167,6 @@ dependencies {
// Need to avoid having support_android = true set on dependencies. // Need to avoid having support_android = true set on dependencies.
testCompile "org.robolectric:robolectric:4.3.1" testCompile "org.robolectric:robolectric:4.3.1"
testCompile "org.robolectric:android-all:10-robolectric-5803371"
} }
task setUpRepository(type: BuildConfigGenerator) { task setUpRepository(type: BuildConfigGenerator) {
......
...@@ -231,9 +231,6 @@ class ChromiumDepGraph { ...@@ -231,9 +231,6 @@ class ChromiumDepGraph {
licenseUrl: "https://raw.githubusercontent.com/plume-lib/require-javadoc/master/LICENSE"), licenseUrl: "https://raw.githubusercontent.com/plume-lib/require-javadoc/master/LICENSE"),
'org_plumelib_reflection_util': new PropertyOverride( 'org_plumelib_reflection_util': new PropertyOverride(
licenseUrl: "https://raw.githubusercontent.com/plume-lib/reflection-util/master/LICENSE"), licenseUrl: "https://raw.githubusercontent.com/plume-lib/reflection-util/master/LICENSE"),
'org_robolectric_android_all': new PropertyOverride(
licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
licenseName: "Apache 2.0"),
'org_robolectric_annotations': new PropertyOverride( 'org_robolectric_annotations': new PropertyOverride(
licensePath: "licenses/Codehaus_License-2009.txt", licensePath: "licenses/Codehaus_License-2009.txt",
licenseName: "MIT"), licenseName: "MIT"),
......
file://third_party/android_deps/OWNERS
\ No newline at end of file
Name: Google Android android-all Library
Short Name: android-all
URL: http://source.android.com/
Version: 10-robolectric-5803371
License: Apache 2.0
License File: NOT_SHIPPED
Security Critical: no
Description:
A library jar that provides APIs for Applications written for the Google Android Platform.
Local Modifications:
No modifications.
# 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:10-robolectric-5803371-cr0
package: chromium/third_party/android_deps/libs/org_robolectric_android_all
description: "Google Android android-all Library"
data:
- file: android-all-10-robolectric-5803371.jar
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