diff options
| author | Dan Albert <danalbert@google.com> | 2023-04-08 00:23:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-08 00:23:56 +0000 |
| commit | 529761b4976ee0e1c9a945ae27a52cbd5cf71d4b (patch) | |
| tree | bda3fb4041ec763cc1baa7e7298f15b54fc51d40 | |
| parent | 0abb0304a3d2e3be0b061be01601b67aef4f8945 (diff) | |
| parent | c8417c0da91a437e1998bfa2eb1bd082e992ee9a (diff) | |
| download | external_updater-529761b4976ee0e1c9a945ae27a52cbd5cf71d4b.tar.gz | |
Speed up updater.sh by removing lunch dependency. am: 048618758a am: 685fa26ac8 am: 62e45ad527 am: c8417c0da9
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/2529239
Change-Id: Idfa7d97ef6f9a51f0d399cdf1cd0b3965b99e37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | fileutils.py | 8 | ||||
| -rwxr-xr-x | updater.sh | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/fileutils.py b/fileutils.py index 789dc7c..841e0d7 100644 --- a/fileutils.py +++ b/fileutils.py @@ -24,9 +24,15 @@ from google.protobuf import text_format # type: ignore # pylint: disable=import-error import metadata_pb2 # type: ignore -ANDROID_TOP = Path(os.environ.get('ANDROID_BUILD_TOP', os.getcwd())) +ANDROID_TOP = Path(os.getcwd()) EXTERNAL_PATH = ANDROID_TOP / 'external' +if not EXTERNAL_PATH.exists(): + raise RuntimeError( + f"{EXTERNAL_PATH} does not exist. This program must be run from the " + f"root of an Android tree (CWD is {os.getcwd()})." + ) + METADATA_FILENAME = 'METADATA' @@ -17,10 +17,5 @@ set -e cd $(dirname "$0")/../.. -source build/envsetup.sh -if [ -z ${TARGET_PRODUCT} ] || [ -z ${TARGET_BUILD_VARIANT} ] -then - lunch aosp_arm-eng -fi -mmma tools/external_updater +.//build/soong/soong_ui.bash --make-mode external_updater out/host/linux-x86/bin/external_updater $@ |