Skip to content

A
angle
Commit eb91ebc9 by Lubosz Sarnecki Committed by Commit Bot
Options

DEPS: Add Android tombstone resolution dependencies.

Add third_party/android_platform and tools/python from the Chromium git to satisfy dependencies for the build/android/tombstones.py script. Bug: angleproject:5933 Change-Id: Ie19eec46c8cab208cde5064118ae655303e12fa7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2878848Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
parent e72fa36e
Showing with 14 additions and 0 deletions
.gitignore
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
/third_party/android_build_tools /third_party/android_build_tools
/third_party/android_deps /third_party/android_deps
/third_party/android_ndk /third_party/android_ndk
/third_party/android_platform
/third_party/android_sdk /third_party/android_sdk
/third_party/android_system_sdk/*.jar /third_party/android_system_sdk/*.jar
/third_party/bazel/desugar/*.jar /third_party/bazel/desugar/*.jar
...@@ -85,6 +86,7 @@ ...@@ -85,6 +86,7 @@
/tools/md_browser /tools/md_browser
/tools/memory /tools/memory
/tools/protoc_wrapper /tools/protoc_wrapper
/tools/python
/tools/skia_goldctl /tools/skia_goldctl
/tools/swarming_client /tools/swarming_client
angle_debug.txt angle_debug.txt
......
DEPS
...@@ -227,6 +227,11 @@ deps = { ...@@ -227,6 +227,11 @@ deps = {
'condition': 'checkout_android and not build_with_chromium', 'condition': 'checkout_android and not build_with_chromium',
}, },
'third_party/android_platform': {
'url': '{chromium_git}/chromium/src/third_party/android_platform@fdaa5e5b9f6384c3011ca8479d672e47528f743f',
'condition': 'checkout_android and not build_with_chromium',
},
'third_party/android_sdk': { 'third_party/android_sdk': {
'url': '{chromium_git}/chromium/src/third_party/android_sdk@1cfc90728e0c42cbd68d8c900a3d46d5f8ba86ec', 'url': '{chromium_git}/chromium/src/third_party/android_sdk@1cfc90728e0c42cbd68d8c900a3d46d5f8ba86ec',
'condition': 'checkout_android and not build_with_chromium', 'condition': 'checkout_android and not build_with_chromium',
...@@ -568,6 +573,11 @@ deps = { ...@@ -568,6 +573,11 @@ deps = {
'condition': 'not build_with_chromium', 'condition': 'not build_with_chromium',
}, },
'tools/python': {
'url': '{chromium_git}/chromium/src/tools/python@dda1627b521c77359abd0431b72ef44329ccefc9',
'condition': 'checkout_android and not build_with_chromium',
},
'tools/skia_goldctl/linux': { 'tools/skia_goldctl/linux': {
'packages': [ 'packages': [
{ {
......
scripts/roll_chromium_deps.py
...@@ -47,6 +47,7 @@ ANGLE_CHROMIUM_DEPS = [ ...@@ -47,6 +47,7 @@ ANGLE_CHROMIUM_DEPS = [
'third_party/android_build_tools/bundletool', 'third_party/android_build_tools/bundletool',
'third_party/android_deps', 'third_party/android_deps',
'third_party/android_ndk', 'third_party/android_ndk',
'third_party/android_platform',
'third_party/android_sdk', 'third_party/android_sdk',
'third_party/android_sdk/androidx_browser/src', 'third_party/android_sdk/androidx_browser/src',
'third_party/android_sdk/public', 'third_party/android_sdk/public',
...@@ -79,6 +80,7 @@ ANGLE_CHROMIUM_DEPS = [ ...@@ -79,6 +80,7 @@ ANGLE_CHROMIUM_DEPS = [
'tools/md_browser', 'tools/md_browser',
'tools/memory', 'tools/memory',
'tools/protoc_wrapper', 'tools/protoc_wrapper',
'tools/python',
'tools/skia_goldctl/linux', 'tools/skia_goldctl/linux',
'tools/skia_goldctl/mac', 'tools/skia_goldctl/mac',
'tools/skia_goldctl/win', 'tools/skia_goldctl/win',
......
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