diff options
author | Anton Hansson <hansson@google.com> | 2018-04-06 13:57:08 +0100 |
---|---|---|
committer | Anton Hansson <hansson@google.com> | 2018-04-10 18:48:36 +0100 |
commit | 10861a06f91b1b3016c851216634a3dadc382213 (patch) | |
tree | 921260589a008763fbdd4116bc0e603297780830 | |
parent | fffe5a1d4441eaf12a39ceb5bca302de0dcf4e9e (diff) | |
download | sdk-10861a06f91b1b3016c851216634a3dadc382213.tar.gz |
Rename update_current to update_prebuilts.
It's used to update more than just "current" now, and update_prebuilts
seems like a slightly more future-proof name than update_sdk which I also
considered.
Bug: 77525052
Test: N/A.
Change-Id: I3a2f548070806ce75a47c448018f7d2f4c286f11
-rw-r--r-- | current/fix_dependencies.mk | 2 | ||||
l--------- | update_current.py | 1 | ||||
l--------- | update_prebuilts.py | 1 | ||||
-rw-r--r-- | update_prebuilts/README (renamed from update_current/README) | 0 | ||||
-rwxr-xr-x | update_prebuilts/extract_deps.py (renamed from update_current/extract_deps.py) | 4 | ||||
-rw-r--r-- | update_prebuilts/extract_deps.tmpl (renamed from update_current/extract_deps.tmpl) | 0 | ||||
-rwxr-xr-x | update_prebuilts/update_prebuilts.py (renamed from update_current/update_current.py) | 4 |
7 files changed, 6 insertions, 6 deletions
diff --git a/current/fix_dependencies.mk b/current/fix_dependencies.mk index 6d679b865..978bb06a1 100644 --- a/current/fix_dependencies.mk +++ b/current/fix_dependencies.mk @@ -22,7 +22,7 @@ # support_java_deps # # This file was automatically generated with: -# ./update_current/extract_deps.py current/androidx/Android.mk current/car/Android.mk current/extras/Android.mk current/optional/Android.mk current/support/Android.mk current/extras/app-toolkit/Android.mk current/extras/constraint-layout/Android.mk current/extras/material-design/Android.mk current/extras/material-design-split-x/Android.mk +# ./update_prebuilts/extract_deps.py current/androidx/Android.mk current/car/Android.mk current/extras/Android.mk current/optional/Android.mk current/support/Android.mk current/extras/app-toolkit/Android.mk current/extras/constraint-layout/Android.mk current/extras/material-design/Android.mk current/extras/material-design-split-x/Android.mk ########################################################################### # Only AAPT2 clients get transitive dependency resolution. This may be removed diff --git a/update_current.py b/update_current.py deleted file mode 120000 index 2b894503a..000000000 --- a/update_current.py +++ /dev/null @@ -1 +0,0 @@ -update_current/update_current.py
\ No newline at end of file diff --git a/update_prebuilts.py b/update_prebuilts.py new file mode 120000 index 000000000..f93fd3ae1 --- /dev/null +++ b/update_prebuilts.py @@ -0,0 +1 @@ +update_prebuilts/update_prebuilts.py
\ No newline at end of file diff --git a/update_current/README b/update_prebuilts/README index 85eed01e9..85eed01e9 100644 --- a/update_current/README +++ b/update_prebuilts/README diff --git a/update_current/extract_deps.py b/update_prebuilts/extract_deps.py index b64791d39..552dc763e 100755 --- a/update_current/extract_deps.py +++ b/update_prebuilts/extract_deps.py @@ -3,7 +3,7 @@ # This script is used to generate flattened lists of transitive dependencies # for consumption by build/make/core/support_libraries.mk based on the output # of the pom2mk tool. Typically, this script should only be called by -# update_current.py; however, it may also be run manually against the +# update_prebuilts.py; however, it may also be run manually against the # Android.mk generated by that script. import sys, argparse, os from string import Template @@ -94,7 +94,7 @@ def expand_deps_helper(module, deps): jdep_transitive += jdeps # Strip "shallow" modules used for static inclusion. We can remove this - # after turning off --static-deps in update_current.py. + # after turning off --static-deps in update_prebuilts.py. if dep + "-nodeps" in adeps and dep in deps[module][1]: deps[module][1].remove(dep) if dep + "-nodeps" in jdeps and dep in deps[module][2]: diff --git a/update_current/extract_deps.tmpl b/update_prebuilts/extract_deps.tmpl index 695d6baab..695d6baab 100644 --- a/update_current/extract_deps.tmpl +++ b/update_prebuilts/extract_deps.tmpl diff --git a/update_current/update_current.py b/update_prebuilts/update_prebuilts.py index 2a997319a..edf611c0e 100755 --- a/update_current/update_current.py +++ b/update_prebuilts/update_prebuilts.py @@ -841,7 +841,7 @@ if uncommittedChangesExist(): subprocess.check_call("cd " + git_dir + " && git commit -m 'save working state'", shell=True) if uncommittedChangesExist(): - print_e('FAIL: There are uncommitted changes here. Please commit or stash before continuing, because update_current.py will run "git reset --hard" if execution fails') + print_e('FAIL: There are uncommitted changes here. Please commit or stash before continuing, because %s will run "git reset --hard" if execution fails' % os.path.basename(__file__)) sys.exit(1) try: @@ -916,7 +916,7 @@ try: with open(depsfile, 'w') as f: cwd=os.getcwd() subprocess.check_call( - './update_current/extract_deps.py current/*/Android.mk current/extras/*/Android.mk', + './update_prebuilts/extract_deps.py current/*/Android.mk current/extras/*/Android.mk', stdout=f, cwd=cwd, shell=True) subprocess.check_call(['git', 'add', depsfile]) |