diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-05 22:45:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 22:45:32 +0000 |
commit | a5e4f4d2969520f4563ec0d66cbe469c49ee38bc (patch) | |
tree | 8a0d6fd78eb610653f12ded770595c80f1e89a61 /catapult/devil/devil/devil_dependencies.json | |
parent | 5e1447373f2b6aaefa0e866c5907a291e7071a3d (diff) | |
parent | 5338649baa46daab43dd19d939fc1f016d400a94 (diff) | |
download | chromium-trace-a5e4f4d2969520f4563ec0d66cbe469c49ee38bc.tar.gz |
Merge changes Ie9f01eed,I3acb8a0d am: fb769a1607 am: 316160b179 am: 3fd616f492 am: 5338649baa
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1392438
Change-Id: I01f6e9f32cc3210fbc5f6f645a77b74316ecfb3b
Diffstat (limited to 'catapult/devil/devil/devil_dependencies.json')
-rw-r--r-- | catapult/devil/devil/devil_dependencies.json | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/catapult/devil/devil/devil_dependencies.json b/catapult/devil/devil/devil_dependencies.json index 8b397882..8e15e357 100644 --- a/catapult/devil/devil/devil_dependencies.json +++ b/catapult/devil/devil/devil_dependencies.json @@ -31,12 +31,22 @@ } } }, + "bundletool": { + "cloud_storage_base_folder": "binary_dependencies", + "cloud_storage_bucket": "chromium-telemetry", + "file_info": { + "default": { + "cloud_storage_hash": "721525531f3c3ec66b39afd74c2a05e6d3973eef", + "download_path": "../bin/deps/default/lib.java/bundletool-all-0.10.3.jar" + } + } + }, "chromium_commands": { "cloud_storage_base_folder": "binary_dependencies", "cloud_storage_bucket": "chromium-telemetry", "file_info": { "linux2_x86_64": { - "cloud_storage_hash": "4e22f641e4757309510e8d9f933f5aa504574ab6", + "cloud_storage_hash": "6efb1501c7c49e6ae84cc467648930eaf9f6a9e5", "download_path": "../bin/deps/linux2/x86_64/lib.java/chromium_commands.dex.jar" } } @@ -70,7 +80,7 @@ "cloud_storage_bucket": "chromium-telemetry", "file_info": { "linux2_x86_64": { - "cloud_storage_hash": "db9728166f182800eb9d09e9f036d56e105e8235", + "cloud_storage_hash": "fe84a6714192f6596bf09215caeea34ed937a42b", "download_path": "../bin/deps/linux2/x86_64/bin/fastboot" } } @@ -80,12 +90,20 @@ "cloud_storage_bucket": "chromium-telemetry", "file_info": { "android_arm64-v8a": { - "cloud_storage_hash": "f222268d8442979240d1b18de00911a49e548daa", + "cloud_storage_hash": "b30e8bfb234d02899b05a7957c6a84dc6e16ec4b", "download_path": "../bin/deps/android/arm64-v8a/bin/forwarder_device" }, "android_armeabi-v7a": { - "cloud_storage_hash": "c15267bf01c26eb0aea4f61c780bbba460c5c981", + "cloud_storage_hash": "efc7f092f5394a7b88d77a2544adfe33c5c4fd3c", "download_path": "../bin/deps/android/armeabi-v7a/bin/forwarder_device" + }, + "android_x86": { + "cloud_storage_hash": "ec841e99335f8c9bbcf2e3da40dd8a7ebefe2b6e", + "download_path": "../bin/deps/android/x86/bin/forwarder_device" + }, + "android_x86_64": { + "cloud_storage_hash": "b9921146385bb7c3fc7246084c37a175e7bb97bd", + "download_path": "../bin/deps/android/x86_64/bin/forwarder_device" } } }, @@ -94,7 +112,7 @@ "cloud_storage_bucket": "chromium-telemetry", "file_info": { "linux2_x86_64": { - "cloud_storage_hash": "8fe69994b670f028484eed475dbffc838c8a57f7", + "cloud_storage_hash": "334c172dd90bae568cbff9465130f1245a35cade", "download_path": "../bin/deps/linux2/x86_64/forwarder_host" } } @@ -104,16 +122,20 @@ "cloud_storage_bucket": "chromium-telemetry", "file_info": { "android_arm64-v8a": { - "cloud_storage_hash": "4e7d2dedd9c6321fdc152b06869e09a3c5817904", + "cloud_storage_hash": "e9e1a4e2f1c24180a5cac496c3c50213384b51eb", "download_path": "../bin/deps/android/arm64-v8a/bin/md5sum_device" }, "android_armeabi-v7a": { - "cloud_storage_hash": "39fd90af0f8828202b687f7128393759181c5e2e", + "cloud_storage_hash": "f0cf40aec71df24d50a2644bed199ffd7588082d", "download_path": "../bin/deps/android/armeabi-v7a/bin/md5sum_device" }, "android_x86": { - "cloud_storage_hash": "d5cf42ab5986a69c31c0177b0df499d6bf708df6", + "cloud_storage_hash": "7530812af4b3cd2f20d9ce27e3615828cb4e4fc2", "download_path": "../bin/deps/android/x86/bin/md5sum_device" + }, + "android_x86_64": { + "cloud_storage_hash": "4cd36953c44119578568a723854d43b8ed124d7e", + "download_path": "../bin/deps/android/x86_64/bin/md5sum_device" } } }, @@ -122,7 +144,7 @@ "cloud_storage_bucket": "chromium-telemetry", "file_info": { "linux2_x86_64": { - "cloud_storage_hash": "4db5bd5e9bea8880d8bf2caa59d0efb0acc19f74", + "cloud_storage_hash": "f2428a52730c6593267678c75f95cdc7dffb58df", "download_path": "../bin/deps/linux2/x86_64/bin/md5sum_host" } } |