Run 'nativeperms', remove Brillo #ifdef.

Bug: 25663983
Change-Id: I5b9f9747695d75f84bdfb61f90d28e0e5fee612c

diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp
index 61f24d6..725ebdf 100644 (file)
--- a/libs/binder/IServiceManager.cpp
+++ b/libs/binder/IServiceManager.cpp
@@ -67,11 +67,6 @@ bool checkCallingPermission(const String16& permission, int32_t* outPid, int32_t
 
 bool checkPermission(const String16& permission, pid_t pid, uid_t uid)
 {
-#ifdef __BRILLO__
-    // Brillo doesn't currently run ActivityManager or support framework permissions.
-    return true;
-#endif
-
     sp<IPermissionController> pc;
     gDefaultServiceManagerLock.lock();
     pc = gPermissionController;

diff --git a/services/nativeperms/Android.mk b/services/nativeperms/Android.mk
index 6cde63a..34ccd0b 100644 (file)
--- a/services/nativeperms/Android.mk
+++ b/services/nativeperms/Android.mk
@@ -27,6 +27,5 @@ LOCAL_SHARED_LIBRARIES := \
     libbrillo-binder \
     libchrome \
     libutils
-# Commented out momentarily until SELinux policies land in a different repo.
-# LOCAL_INIT_RC := nativeperms.rc
+LOCAL_INIT_RC := nativeperms.rc
 include $(BUILD_EXECUTABLE)