commit 553a4371306e29fb03c44c5dda56d2b775a8c3dc
author Jeff Gaston <jeffrygaston@google.com> Thu Mar 29 18:34:22 2018 -0400
committer Jeff Gaston <jeffrygaston@google.com> Fri Mar 30 18:12:01 2018 -0400
tree 501b2129582508d4166258137ad90e0f42eab3b8
parent bbe56109d27df90fa0d96014e0d4d80a75d6f86e

Have update_current keep the OWNERS file when updating jetifier-standalone

Bug: 76692459
Test: ./update_current.py -j 4688943
Change-Id: I96b56fde57ccf2e87854f660713b510b43812b51

update_current/update_current.py

diff --git a/update_current/update_current.py b/update_current/update_current.py
index db5b5c3..ff10c90 100755
--- a/update_current/update_current.py
+++ b/update_current/update_current.py
@@ -16,7 +16,7 @@
 androidx_dir = os.path.join(current_path, 'androidx')
 extras_dir = os.path.join(current_path, 'extras')
 buildtools_dir = 'tools'
-jetifier_dir = os.path.join(buildtools_dir, 'jetifier')
+jetifier_dir = os.path.join(buildtools_dir, 'jetifier', 'jetifier-standalone')
 
 temp_dir = os.path.join(os.getcwd(), "support_tmp")
 os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
@@ -536,8 +536,8 @@
         return False
 
     rm(jetifier_dir)
-    mv(repo_dir, jetifier_dir)
-    os.chmod(os.path.join(jetifier_dir, 'jetifier-standalone', 'bin', 'jetifier-standalone'), 0o755)
+    mv(os.path.join(repo_dir, 'jetifier-standalone'), jetifier_dir)
+    os.chmod(os.path.join(jetifier_dir, 'bin', 'jetifier-standalone'), 0o755)
     return True