ANDROID: Re-enable compat16 syscall tests.

The compat16 syscall variants of numerous tests had been disabled by
blacklisting a cflag, but whatever the original problem was, it appears
to have been fixed in AOSP master.

All of the _16 tests build now, and every one completes successfully
except fchown03_16 (but fchown03 also does not work).

Bug: 37950676
Bug: 73166481
Test: built & ran all newly enabled tests on hikey960
Test: build & ran all newly enabled tests on cuttlefish
Change-Id: I6c92a5dc7eb48e647fd16ac801a9dc190ec09264
Signed-off-by: Alistair Strachan <astrachan@google.com>
diff --git a/gen.bp b/gen.bp
index 479ff39..040416a 100644
--- a/gen.bp
+++ b/gen.bp
@@ -872,6 +872,23 @@
 }
 
 cc_test {
+    name: "ltp_chown01_16",
+    stem: "chown01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/chown/chown01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/chown",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_chown02",
     stem: "chown02",
     defaults: ["ltp_test_defaults"],
@@ -886,6 +903,23 @@
 }
 
 cc_test {
+    name: "ltp_chown02_16",
+    stem: "chown02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/chown/chown02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/chown",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_chown03",
     stem: "chown03",
     defaults: ["ltp_test_defaults"],
@@ -900,6 +934,23 @@
 }
 
 cc_test {
+    name: "ltp_chown03_16",
+    stem: "chown03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/chown/chown03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/chown",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_chown05",
     stem: "chown05",
     defaults: ["ltp_test_defaults"],
@@ -914,6 +965,23 @@
 }
 
 cc_test {
+    name: "ltp_chown05_16",
+    stem: "chown05_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/chown/chown05.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/chown",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_chroot01",
     stem: "chroot01",
     defaults: ["ltp_test_defaults"],
@@ -2736,6 +2804,23 @@
 }
 
 cc_test {
+    name: "ltp_fchown01_16",
+    stem: "fchown01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fchown/fchown01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/fchown",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_fchown02",
     stem: "fchown02",
     defaults: ["ltp_test_defaults"],
@@ -2750,6 +2835,23 @@
 }
 
 cc_test {
+    name: "ltp_fchown02_16",
+    stem: "fchown02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fchown/fchown02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/fchown",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_fchown03",
     stem: "fchown03",
     defaults: ["ltp_test_defaults"],
@@ -2764,6 +2866,23 @@
 }
 
 cc_test {
+    name: "ltp_fchown03_16",
+    stem: "fchown03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fchown/fchown03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/fchown",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_fchown04",
     stem: "fchown04",
     defaults: ["ltp_test_defaults"],
@@ -2778,6 +2897,23 @@
 }
 
 cc_test {
+    name: "ltp_fchown04_16",
+    stem: "fchown04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fchown/fchown04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/fchown",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_fchown05",
     stem: "fchown05",
     defaults: ["ltp_test_defaults"],
@@ -2792,6 +2928,23 @@
 }
 
 cc_test {
+    name: "ltp_fchown05_16",
+    stem: "fchown05_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fchown/fchown05.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/fchown",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_fchownat01",
     stem: "fchownat01",
     defaults: ["ltp_test_defaults"],
@@ -5542,6 +5695,23 @@
 }
 
 cc_test {
+    name: "ltp_getegid01_16",
+    stem: "getegid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getegid/getegid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/getegid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getegid02",
     stem: "getegid02",
     defaults: ["ltp_test_defaults"],
@@ -5556,6 +5726,23 @@
 }
 
 cc_test {
+    name: "ltp_getegid02_16",
+    stem: "getegid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getegid/getegid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/getegid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_geteuid01",
     stem: "geteuid01",
     defaults: ["ltp_test_defaults"],
@@ -5570,6 +5757,23 @@
 }
 
 cc_test {
+    name: "ltp_geteuid01_16",
+    stem: "geteuid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/geteuid/geteuid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/geteuid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_geteuid02",
     stem: "geteuid02",
     defaults: ["ltp_test_defaults"],
@@ -5584,6 +5788,23 @@
 }
 
 cc_test {
+    name: "ltp_geteuid02_16",
+    stem: "geteuid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/geteuid/geteuid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/geteuid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getgid01",
     stem: "getgid01",
     defaults: ["ltp_test_defaults"],
@@ -5598,6 +5819,23 @@
 }
 
 cc_test {
+    name: "ltp_getgid01_16",
+    stem: "getgid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getgid/getgid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/getgid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getgid03",
     stem: "getgid03",
     defaults: ["ltp_test_defaults"],
@@ -5612,6 +5850,23 @@
 }
 
 cc_test {
+    name: "ltp_getgid03_16",
+    stem: "getgid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getgid/getgid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/getgid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getgroups01",
     stem: "getgroups01",
     defaults: ["ltp_test_defaults"],
@@ -5626,6 +5881,23 @@
 }
 
 cc_test {
+    name: "ltp_getgroups01_16",
+    stem: "getgroups01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getgroups/getgroups01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/getgroups",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getgroups03",
     stem: "getgroups03",
     defaults: ["ltp_test_defaults"],
@@ -5640,6 +5912,23 @@
 }
 
 cc_test {
+    name: "ltp_getgroups03_16",
+    stem: "getgroups03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getgroups/getgroups03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/getgroups",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_gethostbyname_r01",
     stem: "gethostbyname_r01",
     defaults: ["ltp_test_defaults"],
@@ -6054,6 +6343,23 @@
 }
 
 cc_test {
+    name: "ltp_getuid01_16",
+    stem: "getuid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getuid/getuid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/getuid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getuid03",
     stem: "getuid03",
     defaults: ["ltp_test_defaults"],
@@ -6068,6 +6374,23 @@
 }
 
 cc_test {
+    name: "ltp_getuid03_16",
+    stem: "getuid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getuid/getuid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/getuid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getxattr01",
     stem: "getxattr01",
     defaults: ["ltp_test_defaults"],
@@ -7093,6 +7416,23 @@
 }
 
 cc_test {
+    name: "ltp_lchown01_16",
+    stem: "lchown01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/lchown/lchown01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/lchown",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_lchown02",
     stem: "lchown02",
     defaults: ["ltp_test_defaults"],
@@ -7107,6 +7447,23 @@
 }
 
 cc_test {
+    name: "ltp_lchown02_16",
+    stem: "lchown02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/lchown/lchown02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/lchown",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_lchown03",
     stem: "lchown03",
     defaults: ["ltp_test_defaults"],
@@ -7121,6 +7478,23 @@
 }
 
 cc_test {
+    name: "ltp_lchown03_16",
+    stem: "lchown03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/lchown/lchown03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/lchown",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_lftest",
     stem: "lftest",
     defaults: ["ltp_test_defaults"],
@@ -12422,6 +12796,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsgid01_16",
+    stem: "setfsgid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsgid/setfsgid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setfsgid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setfsgid02",
     stem: "setfsgid02",
     defaults: ["ltp_test_defaults"],
@@ -12436,6 +12827,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsgid02_16",
+    stem: "setfsgid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsgid/setfsgid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setfsgid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setfsgid03",
     stem: "setfsgid03",
     defaults: ["ltp_test_defaults"],
@@ -12450,6 +12858,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsgid03_16",
+    stem: "setfsgid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsgid/setfsgid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setfsgid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setfsuid01",
     stem: "setfsuid01",
     defaults: ["ltp_test_defaults"],
@@ -12464,6 +12889,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsuid01_16",
+    stem: "setfsuid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setfsuid02",
     stem: "setfsuid02",
     defaults: ["ltp_test_defaults"],
@@ -12478,6 +12920,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsuid02_16",
+    stem: "setfsuid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setfsuid03",
     stem: "setfsuid03",
     defaults: ["ltp_test_defaults"],
@@ -12492,6 +12951,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsuid03_16",
+    stem: "setfsuid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setfsuid04",
     stem: "setfsuid04",
     defaults: ["ltp_test_defaults"],
@@ -12506,6 +12982,23 @@
 }
 
 cc_test {
+    name: "ltp_setfsuid04_16",
+    stem: "setfsuid04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgid01",
     stem: "setgid01",
     defaults: ["ltp_test_defaults"],
@@ -12520,6 +13013,23 @@
 }
 
 cc_test {
+    name: "ltp_setgid01_16",
+    stem: "setgid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgid/setgid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setgid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgid02",
     stem: "setgid02",
     defaults: ["ltp_test_defaults"],
@@ -12534,6 +13044,23 @@
 }
 
 cc_test {
+    name: "ltp_setgid02_16",
+    stem: "setgid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgid/setgid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setgid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgid03",
     stem: "setgid03",
     defaults: ["ltp_test_defaults"],
@@ -12548,6 +13075,23 @@
 }
 
 cc_test {
+    name: "ltp_setgid03_16",
+    stem: "setgid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgid/setgid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setgid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgroups01",
     stem: "setgroups01",
     defaults: ["ltp_test_defaults"],
@@ -12562,6 +13106,23 @@
 }
 
 cc_test {
+    name: "ltp_setgroups01_16",
+    stem: "setgroups01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgroups/setgroups01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setgroups",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgroups02",
     stem: "setgroups02",
     defaults: ["ltp_test_defaults"],
@@ -12576,6 +13137,23 @@
 }
 
 cc_test {
+    name: "ltp_setgroups02_16",
+    stem: "setgroups02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgroups/setgroups02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setgroups",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgroups03",
     stem: "setgroups03",
     defaults: ["ltp_test_defaults"],
@@ -12590,6 +13168,23 @@
 }
 
 cc_test {
+    name: "ltp_setgroups03_16",
+    stem: "setgroups03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgroups/setgroups03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setgroups",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setgroups04",
     stem: "setgroups04",
     defaults: ["ltp_test_defaults"],
@@ -12604,6 +13199,23 @@
 }
 
 cc_test {
+    name: "ltp_setgroups04_16",
+    stem: "setgroups04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setgroups/setgroups04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setgroups",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_sethostname01",
     stem: "sethostname01",
     defaults: ["ltp_test_defaults"],
@@ -12761,6 +13373,23 @@
 }
 
 cc_test {
+    name: "ltp_setregid01_16",
+    stem: "setregid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setregid/setregid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/setregid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setregid02",
     stem: "setregid02",
     defaults: ["ltp_test_defaults"],
@@ -12775,6 +13404,23 @@
 }
 
 cc_test {
+    name: "ltp_setregid02_16",
+    stem: "setregid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setregid/setregid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/setregid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setregid03",
     stem: "setregid03",
     defaults: ["ltp_test_defaults"],
@@ -12789,6 +13435,23 @@
 }
 
 cc_test {
+    name: "ltp_setregid03_16",
+    stem: "setregid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setregid/setregid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/setregid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setregid04",
     stem: "setregid04",
     defaults: ["ltp_test_defaults"],
@@ -12803,6 +13466,23 @@
 }
 
 cc_test {
+    name: "ltp_setregid04_16",
+    stem: "setregid04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setregid/setregid04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+        "testcases/kernel/syscalls/setregid",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresgid01",
     stem: "setresgid01",
     defaults: ["ltp_test_defaults"],
@@ -12817,6 +13497,23 @@
 }
 
 cc_test {
+    name: "ltp_setresgid01_16",
+    stem: "setresgid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresgid/setresgid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setresgid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresgid02",
     stem: "setresgid02",
     defaults: ["ltp_test_defaults"],
@@ -12831,6 +13528,23 @@
 }
 
 cc_test {
+    name: "ltp_setresgid02_16",
+    stem: "setresgid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresgid/setresgid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setresgid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresgid03",
     stem: "setresgid03",
     defaults: ["ltp_test_defaults"],
@@ -12845,6 +13559,23 @@
 }
 
 cc_test {
+    name: "ltp_setresgid03_16",
+    stem: "setresgid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresgid/setresgid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setresgid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresgid04",
     stem: "setresgid04",
     defaults: ["ltp_test_defaults"],
@@ -12859,6 +13590,23 @@
 }
 
 cc_test {
+    name: "ltp_setresgid04_16",
+    stem: "setresgid04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresgid/setresgid04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setresgid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresuid01",
     stem: "setresuid01",
     defaults: ["ltp_test_defaults"],
@@ -12873,6 +13621,23 @@
 }
 
 cc_test {
+    name: "ltp_setresuid01_16",
+    stem: "setresuid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresuid/setresuid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setresuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresuid02",
     stem: "setresuid02",
     defaults: ["ltp_test_defaults"],
@@ -12887,6 +13652,23 @@
 }
 
 cc_test {
+    name: "ltp_setresuid02_16",
+    stem: "setresuid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresuid/setresuid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setresuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresuid03",
     stem: "setresuid03",
     defaults: ["ltp_test_defaults"],
@@ -12901,6 +13683,23 @@
 }
 
 cc_test {
+    name: "ltp_setresuid03_16",
+    stem: "setresuid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresuid/setresuid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setresuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresuid04",
     stem: "setresuid04",
     defaults: ["ltp_test_defaults"],
@@ -12915,6 +13714,23 @@
 }
 
 cc_test {
+    name: "ltp_setresuid04_16",
+    stem: "setresuid04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresuid/setresuid04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setresuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setresuid05",
     stem: "setresuid05",
     defaults: ["ltp_test_defaults"],
@@ -12929,6 +13745,23 @@
 }
 
 cc_test {
+    name: "ltp_setresuid05_16",
+    stem: "setresuid05_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setresuid/setresuid05.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setresuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid01",
     stem: "setreuid01",
     defaults: ["ltp_test_defaults"],
@@ -12943,6 +13776,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid01_16",
+    stem: "setreuid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid02",
     stem: "setreuid02",
     defaults: ["ltp_test_defaults"],
@@ -12957,6 +13807,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid02_16",
+    stem: "setreuid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid03",
     stem: "setreuid03",
     defaults: ["ltp_test_defaults"],
@@ -12971,6 +13838,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid03_16",
+    stem: "setreuid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid04",
     stem: "setreuid04",
     defaults: ["ltp_test_defaults"],
@@ -12985,6 +13869,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid04_16",
+    stem: "setreuid04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid05",
     stem: "setreuid05",
     defaults: ["ltp_test_defaults"],
@@ -12999,6 +13900,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid05_16",
+    stem: "setreuid05_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid05.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid06",
     stem: "setreuid06",
     defaults: ["ltp_test_defaults"],
@@ -13013,6 +13931,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid06_16",
+    stem: "setreuid06_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid06.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setreuid07",
     stem: "setreuid07",
     defaults: ["ltp_test_defaults"],
@@ -13027,6 +13962,23 @@
 }
 
 cc_test {
+    name: "ltp_setreuid07_16",
+    stem: "setreuid07_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid07.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setrlimit01",
     stem: "setrlimit01",
     defaults: ["ltp_test_defaults"],
@@ -13141,6 +14093,23 @@
 }
 
 cc_test {
+    name: "ltp_setuid01_16",
+    stem: "setuid01_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setuid/setuid01.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setuid02",
     stem: "setuid02",
     defaults: ["ltp_test_defaults"],
@@ -13155,6 +14124,23 @@
 }
 
 cc_test {
+    name: "ltp_setuid02_16",
+    stem: "setuid02_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setuid/setuid02.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setuid03",
     stem: "setuid03",
     defaults: ["ltp_test_defaults"],
@@ -13169,6 +14155,23 @@
 }
 
 cc_test {
+    name: "ltp_setuid03_16",
+    stem: "setuid03_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setuid/setuid03.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setuid04",
     stem: "setuid04",
     defaults: ["ltp_test_defaults"],
@@ -13183,6 +14186,23 @@
 }
 
 cc_test {
+    name: "ltp_setuid04_16",
+    stem: "setuid04_16",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setuid/setuid04.c"],
+    cflags: [
+        "-DTST_USE_COMPAT16_SYSCALL=1",
+        "-D_FORTIFY_SOURCE=2",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/setuid",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setxattr01",
     stem: "setxattr01",
     defaults: ["ltp_test_defaults"],