diff options
| author | Liz Prucka <lizprucka@google.com> | 2023-03-24 10:43:25 -0500 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2023-03-24 16:59:37 +0100 |
| commit | fbf0499acc828df26995835e51d83c3a0117e716 (patch) | |
| tree | 8b594d0872772d36cc8567227af5aed70fcfcc3f /syz-ci | |
| parent | 44f096ac0a85c4d72d1e609a2ee951edf11dbefb (diff) | |
pkg/build: added build configs for android
Added config structure in build/Android to allow specifying
specific Android targets.
Build config is optional and extensible for individual build
instances.
Diffstat (limited to 'syz-ci')
| -rw-r--r-- | syz-ci/manager.go | 1 | ||||
| -rw-r--r-- | syz-ci/syz-ci.go | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/syz-ci/manager.go b/syz-ci/manager.go index 2af4e1558..e4c368269 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -331,6 +331,7 @@ func (mgr *Manager) build(kernelCommit *vcs.Commit) error { CmdlineFile: mgr.mgrcfg.KernelCmdline, SysctlFile: mgr.mgrcfg.KernelSysctl, Config: mgr.configData, + Build: mgr.mgrcfg.Build, } details, err := build.Image(params) info := mgr.createBuildInfo(kernelCommit, details.CompilerID) diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index e9b51d267..0e5fe6b6e 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -165,6 +165,9 @@ type ManagerConfig struct { Ccache string `json:"ccache"` Userspace string `json:"userspace"` KernelConfig string `json:"kernel_config"` + // Build-type-specific parameters. + // Parameters for concrete types are in Config type in pkg/build/TYPE.go, e.g. pkg/build/android.go. + Build json.RawMessage `json:"build"` // Baseline config for bisection, see pkg/bisect.KernelConfig.BaselineConfig. KernelBaselineConfig string `json:"kernel_baseline_config"` // File with kernel cmdline values (optional). |