android: Add Android TiramisuPrivacySandbox packages into CIPD Also cleans up the 31.0.0 entries which are no longer used. Change-Id: I0882e0c2d67680f24623be9d289b33f37eb69143 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4031392 Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Commit-Queue: John Delaney <johnidel@chromium.org> Cr-Commit-Position: refs/heads/main@{#1079918} NOKEYCHECK=True GitOrigin-RevId: ceb0763aa0ba08abf08d45dfc135cfc60fbdd53b
diff --git a/cipd/build-tools/31.0.0.yaml b/cipd/build-tools/31.0.0.yaml deleted file mode 100644 index 35f476b..0000000 --- a/cipd/build-tools/31.0.0.yaml +++ /dev/null
@@ -1,13 +0,0 @@ -# Copyright 2021 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -package: chromium/third_party/android_sdk/public/build-tools/31.0.0 -description: build-tools Android SDK Build Tools -root: ../../public/ -data: - - dir: build-tools/31.0.0 -# Some tools inspect their argv0 and don't handle CIPD's symlink structure -# correctly. Install in copy mode so that they can find the other directories -# relative to themselves. -install_mode: copy
diff --git a/cipd/platforms/android-31.yaml b/cipd/platforms/android-TiramisuPrivacySandbox.yaml similarity index 79% rename from cipd/platforms/android-31.yaml rename to cipd/platforms/android-TiramisuPrivacySandbox.yaml index a4000a9..7eb98e1 100644 --- a/cipd/platforms/android-31.yaml +++ b/cipd/platforms/android-TiramisuPrivacySandbox.yaml
@@ -1,12 +1,12 @@ -# Copyright 2021 The Chromium Authors +# Copyright 2022 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -package: chromium/third_party/android_sdk/public/platforms/android-31 +package: chromium/third_party/android_sdk/public/platforms/android-TiramisuPrivacySandbox description: platforms Android SDK Platforms library root: ../../public/ data: - - dir: platforms/android-31 + - dir: platforms/android-TiramisuPrivacySandbox # Some tools inspect their argv0 and don't handle CIPD's symlink structure # correctly. Install in copy mode so that they can find the other directories # relative to themselves.
diff --git a/cipd/system_images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64.yaml b/cipd/system_images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64.yaml new file mode 100644 index 0000000..ce3412c --- /dev/null +++ b/cipd/system_images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64.yaml
@@ -0,0 +1,9 @@ +# Copyright 2022 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +package: chromium/third_party/android_sdk/public/system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64 +description: system_images;android-TiramisuPrivacySandbox;google_apis_playstore;x86_64 +root: ../../../../public/ +data: + - dir: system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64