[arch-commits] Commit in android-tools/trunk (3 files)

[Anatol Pomozov]

    Date: Tuesday, August 13, 2019 @ 17:56:23
  Author: anatolik
Revision: 499074

Add an extra selinux include path instead of patching the sources

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/generate_build.rb
Deleted:
  android-tools/trunk/fix_build_selinux.patch

-------------------------+
 PKGBUILD                |    7 +------
 fix_build_selinux.patch |   26 --------------------------
 generate_build.rb       |    2 +-
 3 files changed, 2 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-13 17:51:34 UTC (rev 499073)
+++ PKGBUILD	2019-08-13 17:56:23 UTC (rev 499074)
@@ -26,7 +26,6 @@
         git+https://boringssl.googlesource.com/boringssl#commit=$_boringssl_commit
         generate_build.rb
         fix_build_core.patch
-        fix_build_selinux.patch
         fix_build_e2fsprogs.patch
         bash_completion.fastboot)
         # Bash completion file was taken from https://github.com/mbrubeck/android-completion
@@ -38,9 +37,8 @@
           'SKIP'
           'SKIP'
           'SKIP'
-          'ff8613a331b9026f2f413768f88ccd10e26149bf'
+          'afca7974ad8658e52fd028ead12ad0a959d63273'
           '99a1618bd93af8ef3ff2cca893e950a0346021fe'
-          'b2ccf6dac3577d230f910e668ae70af6051fee46'
           'bcebdf1e706a3c3da175234840c6ee4e13652012'
           '7004dbd0c193668827174880de6f8434de8ceaee')
 
@@ -50,9 +48,6 @@
   cd $srcdir/core
   patch -p1 < ../fix_build_core.patch
 
-  cd $srcdir/selinux
-  patch -p1 < ../fix_build_selinux.patch
-
   cd $srcdir/e2fsprogs
   patch -p1 < ../fix_build_e2fsprogs.patch
 

Deleted: fix_build_selinux.patch
===================================================================
--- fix_build_selinux.patch	2019-08-13 17:51:34 UTC (rev 499073)
+++ fix_build_selinux.patch	2019-08-13 17:56:23 UTC (rev 499074)
@@ -1,26 +0,0 @@
-diff --git a/libsepol/src/private.h b/libsepol/src/private.h
-index b884c23b..447fa64b 100644
---- a/libsepol/src/private.h
-+++ b/libsepol/src/private.h
-@@ -14,7 +14,7 @@
- #endif
- 
- #include <errno.h>
--#include <dso.h>
-+#include "dso.h"
- 
- #ifdef __APPLE__
- #define __BYTE_ORDER  BYTE_ORDER
-diff --git a/libsepol/src/util.c b/libsepol/src/util.c
-index a4008882..d79a8335 100644
---- a/libsepol/src/util.c
-+++ b/libsepol/src/util.c
-@@ -27,7 +27,7 @@
- #include <sepol/policydb/flask_types.h>
- #include <sepol/policydb/policydb.h>
- #include <sepol/policydb/util.h>
--#include <dso.h>
-+#include "dso.h"
- 
- struct val_to_name {
- 	unsigned int val;

Modified: generate_build.rb
===================================================================
--- generate_build.rb	2019-08-13 17:51:34 UTC (rev 499073)
+++ generate_build.rb	2019-08-13 17:56:23 UTC (rev 499074)
@@ -272,7 +272,7 @@
   hierarchy.c
   kernel_to_common.c
 )
-libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include")
+libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include -Iselinux/libsepol/src")
 
 link("fastboot", libfsmgr + libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb + boringssl, "-lz -lpcre2-8 -lpthread -ldl")