android_skia_checkout: copy_git_directory -> third_party/libgif
These must land first: https://review.skia.org/255083 https://review.skia.org/254896
Bug: skia:9654
Change-Id: I104ccc9f6a6ff50a1894ec8c2c9b7ec812d770af
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/255087
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/autoroll/go/repo_manager/android_repo_manager.go b/autoroll/go/repo_manager/android_repo_manager.go
index 591849c..21248d2 100644
--- a/autoroll/go/repo_manager/android_repo_manager.go
+++ b/autoroll/go/repo_manager/android_repo_manager.go
@@ -361,6 +361,10 @@
}
}
+ if _, addGifErr := r.childRepo.Git(ctx, "add", android_skia_checkout.LibGifRelPath); addGifErr != nil {
+ return 0, addGifErr
+ }
+
// Run the pre-upload steps.
for _, s := range r.PreUploadSteps() {
if err := s(ctx, nil, r.httpClient, r.workdir); err != nil {
diff --git a/go/android_skia_checkout/android_skia_checkout.go b/go/android_skia_checkout/android_skia_checkout.go
index 7f39124..c3a906b 100644
--- a/go/android_skia_checkout/android_skia_checkout.go
+++ b/go/android_skia_checkout/android_skia_checkout.go
@@ -20,6 +20,7 @@
SkUserConfigMacRelPath = path.Join("mac", "include", "config", "SkUserConfig.h")
SkUserConfigWinRelPath = path.Join("win", "include", "config", "SkUserConfig.h")
AndroidBpRelPath = path.Join("Android.bp")
+ LibGifRelPath = path.Join("third_party", "libgif")
)
const (
@@ -32,6 +33,14 @@
if _, syncErr := exec.RunCwd(ctx, skiaCheckout, "./bin/sync"); syncErr != nil {
// Sync may return errors, but this is ok.
}
+ libgifargs := []string{
+ "gn/copy_git_directory.py",
+ "third_party/external/libgif",
+ LibGifRelPath,
+ }
+ if _, gifErr := exec.RunCwd(ctx, skiaCheckout, libgifargs...); gifErr != nil {
+ return fmt.Errorf("LibGif copy error: %s", gifErr)
+ }
if _, fetchGNErr := exec.RunCwd(ctx, skiaCheckout, "./bin/fetch-gn"); fetchGNErr != nil {
return fmt.Errorf("Failed to install GN: %s", fetchGNErr)
}
