diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-20 11:40:17 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-11-20 11:44:54 +0000 |
| commit | 012dd7346010ca4d425e0d1552c1bfff6efee1ec (patch) | |
| tree | 49aa650352d074b3d6dc1621f674286a70dbd4e2 /tools | |
| parent | fe0d6cb8f723bc599bcc57cfd3a2f054ec54e042 (diff) | |
| download | android_external_sepolicy-012dd7346010ca4d425e0d1552c1bfff6efee1ec.tar.gz android_external_sepolicy-012dd7346010ca4d425e0d1552c1bfff6efee1ec.tar.bz2 android_external_sepolicy-012dd7346010ca4d425e0d1552c1bfff6efee1ec.zip | |
Fix build.
Introduced by the merge conflict resolution for
3a1eb33be6cd059ce57aa73d9f62613c476db4f3.
Change-Id: Iddbc9e4d83c513d7003102f881793b5b7945566c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/sepolicy-analyze/neverallow.c | 4 | ||||
| -rw-r--r-- | tools/sepolicy-analyze/typecmp.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/sepolicy-analyze/neverallow.c b/tools/sepolicy-analyze/neverallow.c index 1da88c0..60cd29b 100644 --- a/tools/sepolicy-analyze/neverallow.c +++ b/tools/sepolicy-analyze/neverallow.c @@ -10,8 +10,8 @@ #include "neverallow.h" -static int debug; -static int warn; +int debug; +int warn; void neverallow_usage() { fprintf(stderr, "\tneverallow [-w|--warn] [-d|--debug] [-n|--neverallows <neverallow-rules>] | [-f|--file <neverallow-file>]\n"); diff --git a/tools/sepolicy-analyze/typecmp.c b/tools/sepolicy-analyze/typecmp.c index 27eacdf..fce32e1 100644 --- a/tools/sepolicy-analyze/typecmp.c +++ b/tools/sepolicy-analyze/typecmp.c @@ -264,6 +264,10 @@ static int analyze_types(policydb_t * policydb, char diff, char equiv) return 0; } +// defined in neverallow.c +extern int warn; +extern int debug; + int typecmp_func (int argc, char **argv, policydb_t *policydb) { char ch, diff = 0, equiv = 0; |