From 56d5a4006330a4dec5fb6b8940d58d47ee4a64da Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 6 Sep 2022 14:36:00 +0000 Subject: [PATCH] Make banchan support arm64only and x86_64only Test: banchan arm64only Test: banchan x86_64only Change-Id: I1a787a4c5d80db18d7712d257e196dc19f3496b7 (cherry picked from commit 90ac61c8b6c49005a75bce675fcaf26b85886f3e) Merged-In: I1a787a4c5d80db18d7712d257e196dc19f3496b7 --- envsetup.sh | 7 +++++-- target/product/AndroidProducts.mk | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index d08028cefa..a4cf114bf0 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 [ ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] Sets up the build environment for building unbundled apps (APKs). -- banchan: banchan [ ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] +- banchan: banchan [ ...] [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. @@ -880,7 +881,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)" @@ -909,6 +910,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 ee702e5d16..ad6eb55e48 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -77,8 +77,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 \