diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-09-27 08:46:03 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-09-27 08:46:03 +0200 |
| commit | 646d96d95ab2265c4de763c84be9af6032e2f517 (patch) | |
| tree | 0baf989be0b9caf5a0dd05ce1f1628c8e31b8d7e /sys | |
| parent | 075cdcd5eaae17ab054a5cbcdef0492b82e31ccf (diff) | |
Makefile, sys/syz-extract: fix android
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/linux/ion_amd64.const | 1 | ||||
| -rw-r--r-- | sys/linux/ion_arm64.const | 1 | ||||
| -rw-r--r-- | sys/syz-extract/extract.go | 12 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys/linux/ion_amd64.const b/sys/linux/ion_amd64.const index 411b85f71..7771cff35 100644 --- a/sys/linux/ion_amd64.const +++ b/sys/linux/ion_amd64.const @@ -7,3 +7,4 @@ ION_IOC_MAP = 3221768450 ION_IOC_SHARE = 3221768452 ION_IOC_SYNC = 3221768455 __NR_ioctl = 16 +__NR_openat = 257 diff --git a/sys/linux/ion_arm64.const b/sys/linux/ion_arm64.const index 618cc40b2..b68724c39 100644 --- a/sys/linux/ion_arm64.const +++ b/sys/linux/ion_arm64.const @@ -7,3 +7,4 @@ ION_IOC_MAP = 3221768450 ION_IOC_SHARE = 3221768452 ION_IOC_SYNC = 3221768455 __NR_ioctl = 29 +__NR_openat = 56 diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go index bff00b23f..e0717a841 100644 --- a/sys/syz-extract/extract.go +++ b/sys/syz-extract/extract.go @@ -74,6 +74,11 @@ func main() { if *flagBuild && *flagBuildDir != "" { failf("-build and -builddir is an invalid combination") } + android := false + if *flagOS == "android" { + android = true + *flagOS = "linux" + } var archArray []string if *flagArch != "" { archArray = strings.Split(*flagArch, ",") @@ -81,7 +86,7 @@ func main() { for arch := range targets.List[*flagOS] { archArray = append(archArray, arch) } - if *flagOS == "android" { + if android { archArray = []string{"amd64", "arm64"} } sort.Strings(archArray) @@ -98,10 +103,7 @@ func main() { } for _, f := range matches { f = filepath.Base(f) - if *flagOS == "linux" && androidFiles[f] { - continue - } - if *flagOS == "android" && !androidFiles[f] { + if *flagOS == "linux" && android != androidFiles[f] { continue } files = append(files, filepath.Base(f)) |