Don't load nonplat_service_contexts on full-treble.

am: 57fdb1f490

Change-Id: Ic964603c3efff7a7127454cd4c1310721834cea9

libselinux/Android.bp

@@ -87,6 +87,12 @@ cc_defaults {
         }
     },
 
+    product_variables: {
+        treble: {
+            cflags: ["-DFULL_TREBLE"],
+        },
+    },
+
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
 }

libselinux/src/android/android.c

@@ -63,8 +63,12 @@ struct selabel_handle* selinux_android_service_context_handle(void)
         seopts_service = seopts_service_rootfs;
     }
 
-    // TODO(b/36866029) full treble devices can't load non-plat
+#ifdef FULL_TREBLE
+    // Treble compliant devices can only serve plat_service_contexts from servicemanager
+    return selinux_android_service_open_context_handle(seopts_service, 1);
+#else
     return selinux_android_service_open_context_handle(seopts_service, 2);
+#endif
 }
 
 struct selabel_handle* selinux_android_hw_service_context_handle(void)