diff options
| author | Andrei Homescu <ahomescu@google.com> | 2024-02-16 04:33:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 04:33:37 +0000 |
| commit | d534122b91c59ebe11f348d2be2744bf471e7f44 (patch) | |
| tree | a72e6fabc41e1075ad67032fd3d540f5bb3b6c32 | |
| parent | f8924c9d910db019f6627297a6c0973a5d6099b3 (diff) | |
| parent | 76337bfa0c1274d4c5f2c8260ff4b58f018b1dc0 (diff) | |
| download | aosp-d534122b91c59ebe11f348d2be2744bf471e7f44.tar.gz | |
Use external/trusty/lk as the path to LK am: 76337bfa0c
Original change: https://android-review.googlesource.com/c/trusty/vendor/google/aosp/+/2871399
Change-Id: Iaa0dd41df374c672edd5dde37d9bf22b7ddbf4b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | lk_inc_aosp.mk | 6 | ||||
| -rwxr-xr-x | scripts/build.py | 2 | ||||
| -rw-r--r-- | scripts/envsetup.sh | 9 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lk_inc_aosp.mk b/lk_inc_aosp.mk index 1f295cd..8afbcec 100644 --- a/lk_inc_aosp.mk +++ b/lk_inc_aosp.mk @@ -13,10 +13,8 @@ # limitations under the License. # -LKROOT ?= external/lk - -LKINC ?= trusty/kernel \ - external/lk \ +LKINC ?= $(LKROOT) \ + trusty/kernel \ external/headers \ external/trusty/headers \ trusty/hardware/nxp \ diff --git a/scripts/build.py b/scripts/build.py index d466d85..25c0c10 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -285,7 +285,7 @@ def build(args): for project in args.project: cmd = (f'export BUILDROOT={args.build_root};' f'export BUILDID={args.buildid}; nice $BUILDTOOLS_BINDIR/make {project} ' - f'-f external/lk/makefile -j {args.jobs}') + f'-f $LKROOT/makefile -j {args.jobs}') # Call envsetup. If it fails, abort. envsetup = os.path.join(script_dir, "envsetup.sh") cmd = f"source {envsetup:s} && ({cmd:s})" diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh index 13de4b7..08efd65 100644 --- a/scripts/envsetup.sh +++ b/scripts/envsetup.sh @@ -43,6 +43,15 @@ export BUILDTOOLS_BINDIR=${TRUSTY_TOP}/prebuilts/build-tools/linux-x86/bin export BUILDTOOLS_COMMON=${TRUSTY_TOP}/prebuilts/build-tools/common export PY3=$BUILDTOOLS_BINDIR/py3-cmd +if [ -f "$TRUSTY_TOP/external/lk/engine.mk" ]; then + export LKROOT=$TRUSTY_TOP/external/lk +elif [ -f "$TRUSTY_TOP/external/trusty/lk/engine.mk" ]; then + export LKROOT=$TRUSTY_TOP/external/trusty/lk +else + echo "Error: Couldn't locate the LK root directory." 1>&2 + exit 1 +fi + # Additional Python libraries: # Most Trusty Python scripts source this file to find the hermetic # Python interpreter ($PY3). |