Commit c53bedf6 authored by Shenghua Zhang's avatar Shenghua Zhang Committed by Commit Bot

[sdk] Fix yaml data root for Android sdk cipd packages

The current .yaml files are wrapping duplicate directory names like
'public/tools', which cause downloaded packages as
'public/public/tools'. This cl fixed that issue by add the root
directory info to yaml files.

TBR=jbudorick@chromium.org

Bug: 659808
Change-Id: I3be84d33cff2974c7bea481349aef04a45b9548f
Reviewed-on: https://chromium-review.googlesource.com/1013389
Commit-Queue: Shenghua Zhang <shenghuazhang@chromium.org>
Reviewed-by: default avatarShenghua Zhang <shenghuazhang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551124}
parent 397f8899
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_build-tools.yaml -tag version:$version # cipd create --pkg-def cipd_build-tools.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/build-tools package: chromium/third_party/android_sdk/public/build-tools
description: build-tools Android SDK Build Tools description: build-tools Android SDK Build Tools
root: public/
data: data:
- dir: public/build-tools - dir: build-tools
\ No newline at end of file \ No newline at end of file
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_emulator.yaml -tag version:$version # cipd create --pkg-def cipd_emulator.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/emulator package: chromium/third_party/android_sdk/public/emulator
description: emulator Android SDK Emulator library description: emulator Android SDK Emulator library
root: public/
data: data:
- dir: public/emulator - dir: emulator
\ No newline at end of file \ No newline at end of file
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_extras.yaml -tag version:$version # cipd create --pkg-def cipd_extras.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/extras package: chromium/third_party/android_sdk/public/extras
description: extras Android SDK Extras library description: extras Android SDK Extras library
root: public/
data: data:
- dir: public/extras - dir: extras
\ No newline at end of file \ No newline at end of file
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_platform-tools.yaml -tag version:$version # cipd create --pkg-def cipd_platform-tools.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/platform-tools package: chromium/third_party/android_sdk/public/platform-tools
description: platform-tools Android SDK Platform-tools library description: platform-tools Android SDK Platform-tools library
root: public/
data: data:
- dir: public/platform-tools - dir: platform-tools
\ No newline at end of file \ No newline at end of file
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_platform.yaml -tag version:$version # cipd create --pkg-def cipd_platform.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/platforms package: chromium/third_party/android_sdk/public/platforms
description: platforms Android SDK Platforms library description: platforms Android SDK Platforms library
root: public/
data: data:
- dir: public/platforms - dir: platforms
\ No newline at end of file \ No newline at end of file
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_sources.yaml -tag version:$version # cipd create --pkg-def cipd_sources.yaml -tag version:$version
package: chromium/third_party/android_sdk/sources package: chromium/third_party/android_sdk/sources
description: sources Android SDK Sources library description: sources Android SDK Sources library
root: sources/
data: data:
- dir: sources/sources - dir: sources
\ No newline at end of file \ No newline at end of file
...@@ -6,5 +6,6 @@ ...@@ -6,5 +6,6 @@
# cipd create --pkg-def cipd_tools.yaml -tag version:$version # cipd create --pkg-def cipd_tools.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/tools package: chromium/third_party/android_sdk/public/tools
description: tools Android SDK Tools library description: tools Android SDK Tools library
root: public/
data: data:
- dir: public/tools - dir:tools
\ No newline at end of file \ No newline at end of file
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