Add R8 to DEPS.

Chromium has switched to using the r8 dexer from dx, so we need to
switch as well.

Bug: None
Change-Id: I8c7845bd100ad21c6142a35e7f266a2aa37563b0
Reviewed-on: https://webrtc-review.googlesource.com/82062
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23546}
This commit is contained in:
Patrik Höglund
2018-06-08 10:43:05 +02:00
committed by Commit Bot
parent 9edbc27960
commit 72520531e8
7 changed files with 61 additions and 1 deletions

10
DEPS
View File

@ -148,6 +148,16 @@ deps = {
},
'src/third_party/openh264/src':
Var('chromium_git') + '/external/github.com/cisco/openh264' + '@' + '3b51f16a4a41df729f8d647f03e48c5f272911ff',
'src/third_party/r8': {
'packages': [
{
'package': 'chromium/third_party/r8',
'version': 'version:1.0.30',
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},
'src/third_party/requests/src': {
'url': Var('chromium_git') + '/external/github.com/kennethreitz/requests.git' + '@' + 'f172b30356d821d180fa4ecfa3e71c7274a32de4',
'condition': 'checkout_android',

View File

@ -74,6 +74,7 @@
"libjpeg.gni",
"PRESUBMIT.py",
"README.chromium",
"README.chromium.template"
"README.chromium.template",
"r8"
]
}

View File

@ -51,6 +51,7 @@
/openmax_dl/
/openh264/src
/ow2_asm/lib/
/r8/lib
/requests/src
/robolectric/lib/
/robolectric/robolectric

27
third_party/r8/LICENSE vendored Normal file
View File

@ -0,0 +1,27 @@
Copyright (c) 2016, the R8 project authors.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

2
third_party/r8/OWNERS vendored Normal file
View File

@ -0,0 +1,2 @@
estevenson@chromium.org
agrieve@chromium.org

14
third_party/r8/README.chromium vendored Normal file
View File

@ -0,0 +1,14 @@
Name: R8
URL: https://r8.googlesource.com/r8
Version: 1.0.26
License: BSD 3-Clause
License File: NOT_SHIPPED
Security Critical: no
Description:
D8 is a dexer that converts java byte code to dex code.
It is contained in the R8 repo.
We use a wrapper (compatdx) which lets D8 take the same arguments as DX,
which it replaces.
Local Modifications: None

5
third_party/r8/cipd.yaml vendored Normal file
View File

@ -0,0 +1,5 @@
package: chromium/third_party/r8
description: >
D8 is a dexer that converts java byte code to dex code (part of the R8 repo).
data:
- file: lib/compatdx.jar