diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2019-07-29 19:38:45 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2019-07-29 20:00:44 +0800 |
| commit | 9d2e784c1ab59338c064dd3d527dbefaaef45268 (patch) | |
| tree | 63cae21a9c0b5e9d68efea61b9329362deb9fb1c | |
| parent | e97592df99b61599d9fddb13fa859a5d93e7297b (diff) | |
build-android-lcr: remove generation of build_config.json
Most of the info are not correct,
and we have other methods to pass the info for jobs already
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Change-Id: I39d80775e23ea16f92fe819a94eacd25ab86656c
| -rwxr-xr-x | build-scripts/build-android-lcr | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/build-scripts/build-android-lcr b/build-scripts/build-android-lcr index c533888..9d8b588 100755 --- a/build-scripts/build-android-lcr +++ b/build-scripts/build-android-lcr @@ -101,6 +101,7 @@ if [ -f ./android-build-configs/linaro-build.sh ]; then time ./android-build-configs/linaro-build.sh -c "${BUILD_CONFIG_FILENAME}" -ss else source build/envsetup.sh + [ -n "$LUNCH" ] && lunch "$LUNCH" time $MAKE $MAKE_OPTS -j$MAKE_JOBS $MAKE_TARGETS fi unset TIMEFORMAT @@ -128,40 +129,6 @@ if [ -n "$PUBLISH_DESCRIPTIONS" ]; then ${BUILD_SCRIPT_ROOT}/../utils/manifest-descriptions/make.sh out/source-manifest.xml out/pinned-manifest.xml fi -# Create build_config.json as a build artifact -target_kernel_src=`grep '^TARGET_KERNEL_SOURCE' device/linaro/${TARGET_PRODUCT}/BoardConfig.mk|cut -d'=' -f2|tr -d '[[:space:]]'` -if [ -n "${target_kernel_src}" ]; then - kernel_proj_str=`grep "path=\"${target_kernel_src}\"" out/pinned-manifest.xml` - kernel_rev=`echo ${kernel_proj_str} | grep -o "revision[^ ]*" | cut -d"\"" -f2` - kernel_branch=`echo ${kernel_proj_str} | grep -o "upstream[^ ]*" | cut -d"\"" -f2` - kernel_repo_path=`echo ${kernel_proj_str} | grep -o "path[^ ]*" | cut -d"\"" -f2` - cd $kernel_repo_path - kernel_repo=`git remote -v | grep "fetch" | cut -f2 | cut -d " " -f1` - cd - -fi -android_ver=`grep "ro\.build\.version\.release" out/target/product/${TARGET_OUT_DIR}/system/build.prop|cut -d"=" -f2` -toolchain=`echo ${ANDROID_TOOLCHAIN}|awk -F'/' '{print $(NF-1)}'` -build_arch=`echo ${toolchain} | cut -d"-" -f1` -compiler=`$(find ${ANDROID_TOOLCHAIN} -name "*-gcc"|head -n1) --version | head -n1` -dtbs=`find out -iname *.dtb | rev | cut -d"/" -f1 | rev | sort | uniq` -dtbfs="" -for f in $dtbs; -do - dtbfs="\"$f\", $dtbfs" -done -dtb="[${dtbfs%,*}]" -cat > out/build_config.json <<EOF -{ - "kernel_repo" : "${kernel_repo}", - "kernel_commit_id" : "${kernel_rev}", - "kernel_branch" : "${kernel_branch}", - "android_version" : "${android_ver}", - "android_toolchain" : "${toolchain}", - "build_arch" : "${build_arch}", - "compiler" : "${compiler}", - "dtb" : ${dtb} -} -EOF cp changelog.txt out/ flatten_artifacts |