diff options
| author | Colin Cross <ccross@android.com> | 2022-03-21 19:35:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-21 19:35:21 +0000 |
| commit | b2671983c28441d2cd34653f9348b249e47359fd (patch) | |
| tree | 47522351436e8cd7719953d6b40240ffa48f19f8 | |
| parent | 9c582a3806a6f42f1f9dcce8ac6d4b1172950cbe (diff) | |
| parent | 34156d75eadb227810e3d44299aad7fb143206f1 (diff) | |
| download | selinux-b2671983c28441d2cd34653f9348b249e47359fd.tar.gz | |
Merge "Tweak linux_glibc properties for musl builds in external/selinux" am: eee17d58fb am: 5f2d464afe am: 8f4e77c868 am: 34156d75ea
Original change: https://android-review.googlesource.com/c/platform/external/selinux/+/2019596
Change-Id: Ic997b39990b269b4c973cdc966a6825e58b36ae1
| -rw-r--r-- | libselinux/Android.bp | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/libselinux/Android.bp b/libselinux/Android.bp index 6275b410..a677f02d 100644 --- a/libselinux/Android.bp +++ b/libselinux/Android.bp @@ -150,7 +150,7 @@ cc_library { ], target: { - linux_glibc: { + host_linux: { srcs: [ "src/android/android_host.c", "src/avc.c", @@ -162,50 +162,30 @@ cc_library { "src/context.c", "src/deny_unknown.c", "src/enabled.c", - "src/fgetfilecon.c", "src/getenforce.c", "src/getfilecon.c", "src/get_initial_context.c", "src/init.c", - "src/lgetfilecon.c", "src/load_policy.c", - "src/lsetfilecon.c", "src/mapping.c", "src/procattr.c", "src/reject_unknown.c", "src/sestatus.c", - "src/setenforce.c", "src/setexecfilecon.c", - "src/setfilecon.c", "src/stringrep.c", ], }, - linux_bionic: { - enabled: true, + linux_glibc: { srcs: [ - "src/android/android_host.c", - "src/avc.c", - "src/avc_internal.c", - "src/avc_sidtab.c", - "src/compute_av.c", - "src/compute_create.c", - "src/compute_member.c", - "src/context.c", - "src/deny_unknown.c", - "src/enabled.c", - "src/getenforce.c", - "src/getfilecon.c", - "src/get_initial_context.c", - "src/init.c", - "src/load_policy.c", - "src/mapping.c", - "src/procattr.c", - "src/reject_unknown.c", - "src/sestatus.c", - "src/setexecfilecon.c", - "src/stringrep.c", + "src/fgetfilecon.c", + "src/lgetfilecon.c", + "src/lsetfilecon.c", + "src/setfilecon.c", ], }, + linux_bionic: { + enabled: true, + }, android: { srcs: [ |