Commit 4bd08cbc authored by Yun Liu's avatar Yun Liu Committed by Commit Bot

Migrate android SDK path to third_party/android_sdk/public for libyuv

src repo CL: https://chromium-review.googlesource.com/c/chromium/src/+/1518245

Bug: 659808
Change-Id: Iea8bbcf0a58c4cb57a78d48488463643d6668664
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/1542363
Commit-Queue: Yun Liu <yliuyliu@google.com>
Reviewed-by: 's avatarFrank Barchard <fbarchard@chromium.org>
parent 5b6042fa
...@@ -10,6 +10,41 @@ vars = { ...@@ -10,6 +10,41 @@ vars = {
# the commit queue can handle CLs rolling catapult # the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other. # and whatever else without interference from each other.
'catapult_revision': 'a24a725f7834c16b3628bfb63f349b3480bf9592', 'catapult_revision': 'a24a725f7834c16b3628bfb63f349b3480bf9592',
# the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other.
'android_sdk_build-tools_version': 'DLK621q5_Bga5EsOr7cp6bHWWxFKx6UHLu_Ix_m3AckC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_emulator_version
# and whatever else without interference from each other.
'android_sdk_emulator_version': 'ki7EDQRAiZAUYlnTWR1XmI6cJTk65fJ-DNZUU1zrtS8C',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_extras_version
# and whatever else without interference from each other.
'android_sdk_extras_version': 'iIwhhDox5E-mHgwUhCz8JACWQCpUjdqt5KTY9VLugKQC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_patcher_version
# and whatever else without interference from each other.
'android_sdk_patcher_version': 'I6FNMhrXlpB-E1lOhMlvld7xt9lBVNOO83KIluXDyA0C',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platform-tools_version
# and whatever else without interference from each other.
'android_sdk_platform-tools_version': '4Y2Cb2LGzoc-qt-oIUIlhySotJaKeE3ELFedSVe6Uk8C',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platforms_version
# and whatever else without interference from each other.
'android_sdk_platforms_version': 'Kg2t9p0YnQk8bldUv4VA3o156uPXLUfIFAmVZ-Gm5ewC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_sources_version
# and whatever else without interference from each other.
'android_sdk_sources_version': 'K9uEn3JvNELEVjjVK_GQD3ZQD3rqAnJSxCWxjmUmRkgC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_tools_version
# and whatever else without interference from each other.
'android_sdk_tools_version': 'wYcRQC2WHsw2dKWs4EA7fw9Qsyzu1ds1_fRjKmGxe5QC',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_tools-lint_version
# and whatever else without interference from each other.
'android_sdk_tools-lint_version': '89hXqZYzCum3delB5RV7J_QyWkaRodqdtQS0s3LMh3wC',
} }
deps = { deps = {
...@@ -110,6 +145,48 @@ deps = { ...@@ -110,6 +145,48 @@ deps = {
'url': Var('chromium_git') + '/android_tools.git' + '@' + 'e958d6ea74442d4e0849bb8a018d215a0e78981d', 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'e958d6ea74442d4e0849bb8a018d215a0e78981d',
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/third_party/android_sdk/public': {
'packages': [
{
'package': 'chromium/third_party/android_sdk/public/build-tools',
'version': Var('android_sdk_build-tools_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/emulator',
'version': Var('android_sdk_emulator_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/extras',
'version': Var('android_sdk_extras_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/patcher',
'version': Var('android_sdk_patcher_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/platform-tools',
'version': Var('android_sdk_platform-tools_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/platforms',
'version': Var('android_sdk_platforms_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/sources',
'version': Var('android_sdk_sources_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/tools',
'version': Var('android_sdk_tools_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/tools-lint',
'version': Var('android_sdk_tools-lint_version'),
},
],
'condition': 'checkout_android_native_support',
'dep_type': 'cipd',
},
'src/third_party/android_build_tools/aapt2': { 'src/third_party/android_build_tools/aapt2': {
'packages': [ 'packages': [
{ {
...@@ -1002,12 +1079,10 @@ hooks = [ ...@@ -1002,12 +1079,10 @@ hooks = [
# such dependencies we share with Chromium. # such dependencies we share with Chromium.
{ {
# This downloads SDK extras and puts them in the # This downloads SDK extras and puts them in the
# third_party/android_tools/sdk/extras directory. # third_party/android_sdk/public/extras directory.
'name': 'sdkextras', 'name': 'sdkextras',
'condition': 'checkout_android', 'condition': 'checkout_android',
'pattern': '.', 'pattern': '.',
# When adding a new sdk extras package to download, add the package
# directory and zip file to .gitignore in third_party/android_tools.
'action': ['vpython', 'action': ['vpython',
'src/build/android/play_services/update.py', 'src/build/android/play_services/update.py',
'download' 'download'
......
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