Merge "Remove dependency to distutils" am: 68e178a727
Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/2158116 Change-Id: I00b6456c5c4974f0a5f9a9393c51437dc7422b9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
5cd2aa4f71
2 changed files with 5 additions and 4 deletions
|
@ -18,7 +18,8 @@ import os
|
|||
import policy
|
||||
import re
|
||||
import sys
|
||||
import distutils.ccompiler
|
||||
|
||||
SHARED_LIB_EXTENSION = '.dylib' if sys.platform == 'darwin' else '.so'
|
||||
|
||||
#############################################################
|
||||
# Tests
|
||||
|
@ -158,7 +159,7 @@ if __name__ == '__main__':
|
|||
(options, args) = parser.parse_args()
|
||||
|
||||
libpath = os.path.join(os.path.dirname(os.path.realpath(__file__)),
|
||||
"libsepolwrap" + distutils.ccompiler.new_compiler().shared_lib_extension)
|
||||
"libsepolwrap" + SHARED_LIB_EXTENSION)
|
||||
if not os.path.exists(libpath):
|
||||
sys.exit("Error: libsepolwrap does not exist. Is this binary corrupted?\n")
|
||||
|
||||
|
|
|
@ -20,9 +20,9 @@ import policy
|
|||
from policy import MatchPathPrefix
|
||||
import re
|
||||
import sys
|
||||
import distutils.ccompiler
|
||||
|
||||
DEBUG=False
|
||||
SHARED_LIB_EXTENSION = '.dylib' if sys.platform == 'darwin' else '.so'
|
||||
|
||||
'''
|
||||
Use file_contexts and policy to verify Treble requirements
|
||||
|
@ -375,7 +375,7 @@ if __name__ == '__main__':
|
|||
parser.usage)
|
||||
|
||||
libpath = os.path.join(os.path.dirname(os.path.realpath(__file__)),
|
||||
"libsepolwrap" + distutils.ccompiler.new_compiler().shared_lib_extension)
|
||||
"libsepolwrap" + SHARED_LIB_EXTENSION)
|
||||
if not os.path.exists(libpath):
|
||||
sys.exit("Error: libsepolwrap does not exist. Is this binary corrupted?\n")
|
||||
|
||||
|
|
Loading…
Reference in a new issue