tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Make banchan support arm64only and x86_64only"

Browse source
This commit is contained in:
Anton Hansson 2022-09-08 10:57:34 +00:00 committed by Gerrit Code Review
commit 59699234bc
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
envsetup.sh
View file

@ -10,7 +10,8 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y
invocations of 'm' etc. invocations of 'm' etc.
- tapas: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user] - tapas: tapas [<App1> <App2> ...] [arm|x86|arm64|x86_64] [eng|userdebug|user]
Sets up the build environment for building unbundled apps (APKs). 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). Sets up the build environment for building unbundled modules (APEXes).
- croot: Changes directory to the top of the tree, or a subdirectory thereof. - croot: Changes directory to the top of the tree, or a subdirectory thereof.
- m: Makes from the top of the tree. - m: Makes from the top of the tree.
@ -896,7 +897,7 @@ function tapas()
function banchan() function banchan()
{ {
local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)" 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 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)" 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;; x86) product=module_x86;;
arm64) product=module_arm64;; arm64) product=module_arm64;;
x86_64) product=module_x86_64;; x86_64) product=module_x86_64;;
arm64only) product=module_arm64only;;
x86_64only) product=module_x86_64only;;
esac esac
if [ -z "$variant" ]; then if [ -z "$variant" ]; then
variant=eng variant=eng

2
target/product/AndroidProducts.mk
View file

@ -78,8 +78,10 @@ PRODUCT_MAKEFILES += \
$(LOCAL_DIR)/mainline_sdk.mk \ $(LOCAL_DIR)/mainline_sdk.mk \
$(LOCAL_DIR)/module_arm.mk \ $(LOCAL_DIR)/module_arm.mk \
$(LOCAL_DIR)/module_arm64.mk \ $(LOCAL_DIR)/module_arm64.mk \
$(LOCAL_DIR)/module_arm64only.mk \
$(LOCAL_DIR)/module_x86.mk \ $(LOCAL_DIR)/module_x86.mk \
$(LOCAL_DIR)/module_x86_64.mk \ $(LOCAL_DIR)/module_x86_64.mk \
$(LOCAL_DIR)/module_x86_64only.mk \
COMMON_LUNCH_CHOICES := \ COMMON_LUNCH_CHOICES := \
aosp_arm64-eng \ aosp_arm64-eng \