diff options
| author | Anton Hansson <hansson@google.com> | 2022-09-08 10:57:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-09-08 10:57:34 +0000 |
| commit | 59699234bc552074e406b1b95ecc1b1cede71445 (patch) | |
| tree | 715526e6a33b085598f9ca7adae9db8152b95766 | |
| parent | 6ba1c7b6c309d228425968dbbe7399ffcb9d18d7 (diff) | |
| parent | 90ac61c8b6c49005a75bce675fcaf26b85886f3e (diff) | |
| download | build-59699234bc552074e406b1b95ecc1b1cede71445.tar.gz | |
Merge "Make banchan support arm64only and x86_64only"
| -rw-r--r-- | envsetup.sh | 7 | ||||
| -rw-r--r-- | target/product/AndroidProducts.mk | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh index 0eeb7f491a..b967bd812d 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -10,7 +10,8 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y invocations of 'm' etc. - tapas: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] Sets up the build environment for building unbundled apps (APKs). -- banchan: banchan <module1> [<module2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] +- banchan: banchan <module1> [<module2> ...] [arm|x86|arm64|x86_64|arm64_only|x86_64only] \ + [eng|userdebug|user] Sets up the build environment for building unbundled modules (APEXes). - croot: Changes directory to the top of the tree, or a subdirectory thereof. - m: Makes from the top of the tree. @@ -896,7 +897,7 @@ function tapas() function banchan() { local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)" - local product="$(echo $* | xargs -n 1 echo | \grep -E '^(.*_)?(arm|x86|arm64|x86_64)$' | xargs)" + local product="$(echo $* | xargs -n 1 echo | \grep -E '^(.*_)?(arm|x86|arm64|x86_64|arm64only|x86_64only)$' | xargs)" local variant="$(echo $* | xargs -n 1 echo | \grep -E '^(user|userdebug|eng)$' | xargs)" local apps="$(echo $* | xargs -n 1 echo | \grep -E -v '^(user|userdebug|eng|(.*_)?(arm|x86|arm64|x86_64))$' | xargs)" @@ -925,6 +926,8 @@ function banchan() x86) product=module_x86;; arm64) product=module_arm64;; x86_64) product=module_x86_64;; + arm64only) product=module_arm64only;; + x86_64only) product=module_x86_64only;; esac if [ -z "$variant" ]; then variant=eng diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 67b0b17ac9..094ed30828 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -78,8 +78,10 @@ PRODUCT_MAKEFILES += \ $(LOCAL_DIR)/mainline_sdk.mk \ $(LOCAL_DIR)/module_arm.mk \ $(LOCAL_DIR)/module_arm64.mk \ + $(LOCAL_DIR)/module_arm64only.mk \ $(LOCAL_DIR)/module_x86.mk \ $(LOCAL_DIR)/module_x86_64.mk \ + $(LOCAL_DIR)/module_x86_64only.mk \ COMMON_LUNCH_CHOICES := \ aosp_arm64-eng \ |