topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2024-11-30 06:50:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 74770629 to stage-aosp-master

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: fix merge conflict
Change-Id: I7af3ed74c62c9004c17fcb080acfff7ff408945c
This commit is contained in:
Chih-Hung Hsieh 2017-10-12 16:21:08 -07:00 committed by Chih-hung Hsieh
commit c14edd65d9
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
checkpolicy/Android.bp
View File

@ -21,6 +21,7 @@ cc_binary_host {
cc_binary_host {
name: "dispol",
cflags: common_CFLAGS,
srcs: ["test/dispol.c"],
static_libs: ["libsepol"],
}

7
libselinux/Android.bp
View File

@ -8,7 +8,12 @@ common_CFLAGS = [
"-D_GNU_SOURCE",
"-DNO_MEDIA_BACKEND",
"-DNO_X_BACKEND",
"-DNO_DB_BACKEND"
"-DNO_DB_BACKEND",
"-Wall",
"-Werror",
"-Wno-error=missing-noreturn",
"-Wno-error=unused-function",
"-Wno-error=unused-variable",
]
cc_defaults {

3
libsepol/Android.bp
View File

@ -1,10 +1,11 @@
common_CFLAGS = [
"-D_GNU_SOURCE",
"-Wall",
"-Werror",
"-W",
"-Wundef",
"-Wshadow",
"-Wmissing-noreturn",
"-Wno-error=missing-noreturn",
"-Wmissing-format-attribute",
]