aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-11prepare_build_config.py: fix the str object has no attribute decode errorHEADmasterYongqin Liu
which was reported like the following: 12:04:37 + /home/buildslave/srv/aosp-master/build-tools/build-scripts/../node/prepare_build_config.py 'MANIFEST_REPO=https://android.googlesource.com/platform/manifest.git 12:04:37 MANIFEST_BRANCH=master 12:04:37 MAKE_JOBS=16 12:04:37 MAKE_TARGETS="dist" 12:04:37 MANIFEST_FILENAME=default.xml 12:04:37 LUNCH=hikey960-userdebug 12:04:37 TARGET_PRODUCT=hikey960 12:04:37 TARGET_SIMULATOR=false 12:04:37 USE_CLANG_PLATFORM_BUILD=true 12:04:37 SKIP_LICENSE_CHECK=1 12:04:37 REWRITE_MANIFEST=0' 12:04:37 Traceback (most recent call last): 12:04:37 File "/home/buildslave/srv/aosp-master/build-tools/build-scripts/../node/prepare_build_config.py", line 123, in <module> 12:04:37 main(args[0], options.base64) 12:04:37 File "/home/buildslave/srv/aosp-master/build-tools/build-scripts/../node/prepare_build_config.py", line 115, in main 12:04:37 config = convert_config_to_shell(config_in, BUILD_CONFIG_FILE) 12:04:37 File "/home/buildslave/srv/aosp-master/build-tools/build-scripts/../node/prepare_build_config.py", line 93, in convert_config_to_shell 12:04:37 for l in config_text.decode().split("\n"): 12:04:37 AttributeError: 'str' object has no attribute 'decode' by making the config_text passed in a str type for both the base64 and non-base64 cases Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I84c7ffabc1a2b6cf035767a6195d6fe53ff5d4cf
2021-01-04prepare_build_config.py: add support for python3Yongqin Liu
to resolve the syntax error reported like the following: 09:50:06 + /home/buildslave/srv/r-lcr-oreo/build-tools/build-scripts/../node/prepare_build_config.py --base64 QlVJTERfQ09ORklHX1JFUE89aHR0cDovL2FuZHJvaWQtZ2l0LmxpbmFyby5vcmcvZ2l0L2FuZHJvaWQtYnVpbGQtY29uZmlncy5naXQKQlVJTERfQ09ORklHX0JSQU5DSD1tYXN0ZXIK 09:50:06 Traceback (most recent call last): 09:50:06 File "/home/buildslave/srv/r-lcr-oreo/build-tools/build-scripts/../node/prepare_build_config.py", line 123, in <module> 09:50:06 main(args[0], options.base64) 09:50:06 File "/home/buildslave/srv/r-lcr-oreo/build-tools/build-scripts/../node/prepare_build_config.py", line 115, in main 09:50:06 config = convert_config_to_shell(config_in, BUILD_CONFIG_FILE) 09:50:06 File "/home/buildslave/srv/r-lcr-oreo/build-tools/build-scripts/../node/prepare_build_config.py", line 93, in convert_config_to_shell 09:50:06 for l in config_text.split("\n"): 09:50:06 TypeError: a bytes-like object is required, not 'str' Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Iea0e56cae01a3ae1a6552151a4cea8ca682dc3b1
2020-12-28prepare_build_config.py: update print to support python3Yongqin Liu
for syntax error reported like the following: 12:26:34 + /home/buildslave/srv/aosp-master/build-tools/build-scripts/../node/prepare_build_config.py --base64 QlVJTERfQ09ORklHX1JFUE89aHR0cDovL2FuZHJvaWQtZ2l0LmxpbmFyby5vcmcvZ2l0L2FuZHJvaWQtYnVpbGQtY29uZmlncy5naXQKQlVJTERfQ09ORklHX0JSQU5DSD1tYXN0ZXIK 12:26:34 File "/home/buildslave/srv/aosp-master/build-tools/build-scripts/../node/prepare_build_config.py", line 98 12:26:34 print "Invalid build config syntax: " + l 12:26:34 ^ 12:26:34 SyntaxError: Missing parentheses in call to 'print'. Did you mean print("Invalid build config syntax: " + l)? Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Ia731a105ffcb3ff1f6e05948fd11d56ef822858c
2019-10-25build-scripts/build-android-lcr: set MAKE to make by defaultYongqin Liu
when the MAKE var has not been set yet. The original change on build-android script is here: https://git.linaro.org/infrastructure/linaro-android-build-tools.git/commit/build-scripts/build-android?id=cd306aa56d934857d06dfb56067232739b21d16f Here is a failed job that MAKE is empty by default: https://ci.linaro.org/job/lkft-aosp-master-cts-vts/9/console Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I2247b1ab06fc6cb736867748b882d895a91d314c
2019-07-29build-android-lcr: remove generation of build_config.jsonYongqin Liu
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
2019-07-24build-android-lcr: fix the miss of double quoteYongqin Liu
which caused syntax error like this: 08:38:54 + export 'TIMEFORMAT=TIME: Compilation: %lR' 08:38:54 + TIMEFORMAT='TIME: Compilation: %lR' 08:38:54 /home/buildslave/srv/aosp-master/build-tools/build-scripts/build-android-lcr: line 162: unexpected EOF while looking for matching `"' 08:38:54 Build step 'Execute shell' marked build as failure Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I65f73abbe7c252963915d49561adfbdce6503339
2019-07-22build-android-lcr: support to use linaro-build.sh for lcr buildingYongqin Liu
This build-android-lcr script is copied from build-android scirpt. It is used to support the kernel building before running make droidcore for android building. Because with the aosp master now, the kernel modules files must be there already before running make droidcore, otherwise the ko files won't be integrated successfully into the vendor partition Also deleted some settings which in the build-android script, but won't be used for lcr builds now. Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I08b1f5426f1827706b66c2b9db8bae9db7e3c260
2019-03-12build-android: remove the setting on WITH_HOST_DALVIKYongqin Liu
remove the default value settings for WITH_HOST_DALVIK in this building script, make the android building system use the default value of WITH_HOST_DALVIK set in aosp Otherwise it would could building error like reported here: https://ci.linaro.org/job/android-lcr-reference-x15-master/48/console when WITH_HOST_DALVIK is not set explicitly for the build Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I38d318cfdb23c81187aa4b445ebfe719d1dcbcdd
2018-05-18build-scripts: don't remove content of buildVishal Bhoj
Change-Id: I37489850feda86df976a91548ba10fa249297a0d Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2018-05-18build-scripts: don't delete target folderVishal Bhoj
Change-Id: I817aa6e6b02696f3c232514626232fe577548c13 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2018-04-15android-clang-toolchain: adjust to current clang-master build changesBernhard Rosenkränzer
We no longer need to copy lib64 and prebuilt_include from AOSP clang when using clang-master. Copy only files that are still missing from our toolchain tarballs. Change-Id: I199e08354ec6f418b47b7706c29b54fb183b139f Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org>
2018-03-16build-android: don't complain about missing overlayVishal Bhoj
Change-Id: I5074fc4f7299c06f7b6153b1c71bd102193d9f5b Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2018-02-21Update for aosp master build with clang masterMinSeong Kim
Correct path for docker env Change-Id: Ib6d636d82913e2757b93edb20e36821f265804f8
2018-02-21Update for aosp master build with clang masterMinSeong Kim
Prebuilt clang version string is moved. Change-Id: Ifa1df7b6de84aaf0d24c748424bd91e6225a0efe
2017-12-21build-scripts/helpers: generate source-manifest.xml to include all projectsYongqin Liu
without this change, the source-manifest.xml only contains the default projects listed in AOSP, this change will make the generated source-manifest.xml include projects in local_manifests as well Change-Id: I1a6727fe8c5397ce92457de52a3ae068119d4bb0 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-11-27Update for aosp master build with clang masterMinSeong Kim
Make symbolic links instead of copying due to changes that will be made after copies. Change-Id: I028b5ca8835a0b57864706bf5b57449ba9d0ad6f
2017-10-18Update for aosp master build with clang masterLinaro CI
Change-Id: I77b133c574ab219b21dad54cc6279bfba9a08341
2017-09-12disable ccache as we cleanup sources after build nowVishal Bhoj
Change-Id: Id6daee56ef51471b017f9b5c712ec68245347940 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2017-06-19build-android: use system.img if system.tar.bz2 not existYongqin Liu
since we will not support the tarball deployment method from android O preview version, so change here to use system.img and userdata.img if system.tar.bz2 and userdata.tar.bz2 not exist. This will make it still work for old builds till Nougat Change-Id: I2aa57229521cc97c00ccc7b9a4c5373677a81ef0 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-03-27build-android: fix clang toolchain locationVishal Bhoj
Change-Id: Ibda92378816c01ed82e9c2665c657f0203744d79 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2017-03-27build-android: fix clang based buildVishal Bhoj
Change-Id: Ia20c7dbdd379b5ce836bb122f374e6cf57073cc7 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2017-03-08handle redirecting urlsVishal Bhoj
Change-Id: I12a60746b2ce04db6027a7117f86e24ba4d5bc15 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2017-02-21repo sync after a manifest is patchedVishal Bhoj
Change-Id: Ie7f2de8b07868770d5bee79e615c9a2fd270a18b Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2017-02-17create-user-build-script: export TARGET_USES_MKE2FSYongqin Liu
this variant will be used by X15 M-LCR and master Change-Id: I80f928e1078b95cd567388f82f80e243c7f71a85 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-02-16create-user-build-script: update for x15 buildYongqin Liu
export variants of TARGET_BUILD_UBOOT and BOARD_USES_FULL_RECOVERY_IMAGE, also install liblz4-tool package Change-Id: Idfd44fa868306cfce06b816b3a8e30606043eeea Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-02-09build-android: handle patch to local_manifest in private repoVishal Bhoj
Change-Id: I805b439de9ce6f33cf484002dc52fb7f58c5bb7a Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2017-02-01Remove manifest as wellVishal Bhoj
In case of force update to manifest repo init fails. Change-Id: I856d70c50b8db0e936b4ce550bc08fbefbb4750a Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-12-14fix repo tool url due to cgit changesVishal Bhoj
Change-Id: I1fa8da0ce976ec185641b8b3090c490cf2506683 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-26handle patches from private gerrit instanceVishal Bhoj
Change-Id: Ic653185ff66c04ddc150dfc83f762fcc9967c6e1 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-23create-user-build-script: export environment TARGET_SYSTEMIMAGES_USE_SQUASHFSYongqin Liu
which is used for enabling squashfs for system partition Change-Id: I091013847f0ade9944078737a3f4af19393ef4ae Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-11-16build-android: support for external clang toolchainVishal Bhoj
Change-Id: I5b6a3a3b80e6ad5d0528bf0ef72838a3b9c05553 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-16Revert "build-android: support for external clang toolchain"Vishal Bhoj
This reverts commit 10314d0c3c7c9f1d79524b98c3c6037abf4efbe3. Change-Id: I9b85f73c149b4488e114df08538959f3ee6a5ce9
2016-11-16build-android: support for external clang toolchainVishal Bhoj
Change-Id: I8cf83a7bbfbe78b30910c3b87922a010e2b45198 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-10fix typoVishal Bhoj
Change-Id: Ie2b235c26a2727db069fb692326cdeb68d810f21 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-10gerrit trigger: handle changes to android-build-configsVishal Bhoj
configs are not part of manifest hence these need to be handled before parsing the variables. Change-Id: I6bedd35e4b8bfcb219ca9ece1f958f7d9f052a2b Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-10fix typoVishal Bhoj
Change-Id: I53a941ea9cb525075790ea439a371a03cc10f133 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-11-09improve premerge testing of patchesVishal Bhoj
Change-Id: I9ca9274aecf27154e235c43b08b8bf7418c580bd Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-09-15disable showcommands by defaultVishal Bhoj
Change-Id: Ib2ece3b06d18769185d4a5ce3014cb2dfb79593c Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-07-26fix build_config.jsonVishal Bhoj
Change-Id: Ibf2fd74f9d187990737d5496531ad82bcffaeea3 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-07-12create-user-build-script: export TARGET_OPTIMIZE_FOR_SIZE and ↵Yongqin Liu
USE_CLANG_PLATFORM_BUILD TARGET_OPTIMIZE_FOR_SIZE: variant for low mem build USE_CLANG_PLATFORM_BUILD: variant for clang build Change-Id: I25d7e737a87d1d7862f6f3fdf374295753cd2d5d Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-07-08build-android: fix a problem for Changelog captureYongqin Liu
Both "files changed" and "file changed" need to be captured Change-Id: Ief468225a9f02cc0b11d781b3ce4256dde584170 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-07-08create-user-build-script: fix problem for mirror supportYongqin Liu
missed to add the u: for getopts Change-Id: Ife2a64bb8082997f0759f383eb4cc03f66e2f4d1 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-07-07Capture the changelogVishal Bhoj
Change-Id: I5777dd4e3a355271453477c41cabed955efab841 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-07-07create-user-build-script: add dependency packagesYongqin Liu
1. add python-wand and python-crypto for optee_os compilation 2. add mtools package for hikey boot_fat.uefi.img support Change-Id: Ie78cf256da3425fd36a7171b194befaac02b8f99 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-07-07create-user-build-script: add support for using AOSP mirrorYongqin Liu
with the -u option, we can sepcify the AOSP mirror which could help to repo sync AOSP much faster Change-Id: I4d53bcce50945cc274b036392dd49c6471d9e543 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-07-07create-user-build-script: clean environmen variables exportYongqin Liu
1. add new environment export for TARGET_GCC_VERSION_EXP, MALLOC_IMPL, TARGET_BUILD_KERNEL, TARGET_BOOTIMAGE_USE_FAT 2. update to export TARGET_KERNEL_SOURCE with the new common method 3. remove exports for USE_LINARO_TOOLCHAIN, TOOLCHAIN_URL and TARGET_TOOLS_PREFIX which are deprecated for toolchain specification. Change-Id: I888925466c90b507b640f313bc111d2409163658 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-07-07create-user-build-script: add showcommands and redirect make logYongqin Liu
1. add the showcommands for make to see more details of the compilation 2. redirect the compiling log into a file, so that we can ask user to send the compiling log for check if there are compiling problems. Change-Id: I28fa7c8ccdaa5677b9fda49276f00e39d0c16ab6 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2016-06-14remove local_manifest before repo initVishal Bhoj
We need to remove it so that it doesn't cause any conflicts if local_manifest has duplicate repository Change-Id: I5ffad3a841dd995ee2436d2956e698df28b1e857 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-05-24update script to generate build script for latest ubuntu versionsVishal Bhoj
Change-Id: Ibfc99d849bfab1d05061b1ba1558762652461d99 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
2016-04-18disable slave type checkVishal Bhoj
We no more do restricted builds on a separate jenkins instance. This check was very android-build.linaro.org jenkins instance specific in the way it tried to check the restricted build which breaks things on jobs on ci.linaro.org hence removing this part of the code. Change-Id: Id40b9e014f319a20d98977cc39ce7b8a261df198 Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>