Nick Kralevich 3760c1e482 Merge remote-tracking branch 'aosp/upstream-master' into mymerge ... Incorporate the latest upstream SELinux changes into the Android build tree. % git merge aosp/upstream-master --no-ff A followup commit will make Android specific changes to allow this code to compile. - Known issue: - Multiple implementations of partial directory match digesting. To fix bug 62302954 ("Investigate restorecon() / selabel_lookup() performance"), Android implemented a number of patches, including 7d4a56f84d The upstream SELinux community ended up writing their own variant of Android's patch, which accomplishes the same thing. This patch is at e016502c0a This merge has the effect of having both patches in the tree at the same time, which could be confusing. However, the new upstream code isn't used by Android, so there's no impact (other than code bloat and duplication). Change-Id: I2bb804b71763c0c3ba77fe48d42787298f85a9d7 Test: treehugger		2020-02-03 13:00:08 -08:00
..
include/cil	libsepol: cil: Keep type[attribute] declarations when attributizing.	2017-10-11 12:59:43 -07:00
src	Merge remote-tracking branch 'aosp/upstream-master' into mymerge	2020-02-03 13:00:08 -08:00
test	libsepol: Move secilc out of libsepol	2015-03-31 12:31:38 -04:00
.gitignore	Merge commit '76ba6eaa7333483a8cc0c73a7880f7acf99c2656'	2015-02-18 09:25:20 -05:00