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

Commit 82f40c90 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "tree_size" into main 

* changes:
  Add source_tree_size artifact to the android_metadata builds.
  Add import_build_vars to shell_utils.sh
parents 713daec0 91ece41f

ci/build_metadata

+18 −2
Original line number Diff line number Diff line
@@ -14,15 +14,31 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



set -ex

set -x



source build/make/shell_utils.sh



export TARGET_PRODUCT=aosp_arm64

export TARGET_RELEASE=trunk_staging

export TARGET_BUILD_VARIANT=eng



import_build_vars \

        OUT_DIR \

        DIST_DIR \

        HOST_OUT_EXECUTABLES \

    || exit $?



TARGETS=(

    all_teams

    source_tree_size

    release_config_metadata

)



build/soong/bin/m dist ${TARGETS[@]}
 
# Build modules

build/soong/bin/m dist ${TARGETS[@]} || exit $?



# List all source files in the tree

( \

    $HOST_OUT_EXECUTABLES/source_tree_size -o $DIST_DIR/all_source_tree_files.pb \

        && gzip -fn $DIST_DIR/all_source_tree_files.pb \

) || exit $?

shell_utils.sh

+16 −0
Original line number Diff line number Diff line
@@ -214,3 +214,19 @@ function log_tool_invocation() 
    ' SIGINT SIGTERM SIGQUIT EXIT

}



# Import the build variables supplied as arguments into this shell's environment.

# For absolute variables, prefix the variable name with a '/'. For example:

#    import_build_vars OUT_DIR DIST_DIR /HOST_OUT_EXECUTABLES

# Returns nonzero if the build command failed. Stderr is passed through.

function import_build_vars()

{

    require_top

    local script

    script=$(cd $TOP && build/soong/bin/get_build_vars "$@")

    local ret=$?

    if [ $ret -ne 0 ] ; then

        return $ret

    fi

    eval "$script"

    return $?

}