Merge "Avoid dropping Android.bp when updating modules"

KudProject · Feb 11, 2021 · 41f10bc · 41f10bc
2 parents 2c89cd5 + a020cf7
commit 41f10bc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/gki/download_from_ci b/gki/download_from_ci
@@ -374,11 +374,13 @@ def update_androidx_virtual_device_modules(gitlog, output_dir, version):
 
   try:
     subprocess.check_call(["git", "rm", "-rf", "*"], cwd=arm64_mods_dir)
+    subprocess.check_call(["git", "checkout", "HEAD", "Android.bp"], cwd=arm64_mods_dir)
   except subprocess.CalledProcessError:
     pass
 
   try:
     subprocess.check_call(["git", "rm", "-rf", "*"], cwd=x86_64_mods_dir)
+    subprocess.check_call(["git", "checkout", "HEAD", "Android.bp"], cwd=x86_64_mods_dir)
   except subprocess.CalledProcessError:
     pass