Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea5b041d authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Allow selecting a different product in banchan." am: 215596dd am:... 

Merge "Allow selecting a different product in banchan." am: 215596dd am: 818ba935 am: a8d93205

Original change: https://android-review.googlesource.com/c/platform/build/+/1675830

Change-Id: Id067069cdcf92602eb2118359336dd560eb55368
parents e52d2e5d a8d93205

banchanHelp.sh

+6 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SCRIPT_DIR="${PWD}" 
cd ../..

TOP="${PWD}"



message='usage: banchan <module> ... [arm|x86|arm64|x86_64] [eng|userdebug|user]

message='usage: banchan <module> ... [<product>|arm|x86|arm64|x86_64] [eng|userdebug|user]



banchan selects individual APEX modules to be built by the Android build system.

Like "tapas", "banchan" does not request the building of images for a device but
@@ -19,6 +19,11 @@ for building APEX modules rather than apps (APKs). 
The module names should match apex{} modules in Android.bp files, typically

starting with "com.android.".



The product argument should be a product name ending in "_<arch>", where <arch>

is one of arm, x86, arm64, x86_64. It can also be just an arch, in which case

the standard product for building modules with that architecture is used, i.e.

module_<arch>.



The usage of the other arguments matches that of the rest of the platform

build system and can be found by running `m help`'

envsetup.sh

+8 −6
Original line number Diff line number Diff line
@@ -799,17 +799,19 @@ function tapas() 
function banchan()

{

    local showHelp="$(echo $* | xargs -n 1 echo | \grep -E '^(help)$' | xargs)"

    local arch="$(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)$' | 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)"



    if [ "$showHelp" != "" ]; then

      $(gettop)/build/make/banchanHelp.sh

      return

    fi



    if [ $(echo $arch | wc -w) -gt 1 ]; then

        echo "banchan: Error: Multiple build archs supplied: $arch"

    if [ -z "$product" ]; then

        product=arm

    elif [ $(echo $product | wc -w) -gt 1 ]; then

        echo "banchan: Error: Multiple build archs or products supplied: $products"

        return

    fi

    if [ $(echo $variant | wc -w) -gt 1 ]; then
@@ -821,8 +823,8 @@ function banchan() 
        return

    fi



    local product=module_arm

    case $arch in

    case $product in

      arm)    product=module_arm;;

      x86)    product=module_x86;;

      arm64)  product=module_arm64;;

      x86_64) product=module_x86_64;;