Merge 1bfff81fdf6616c6f5b243f89e82beb196c0ccd1 on remote branch

Change-Id: I99bdf155730550cfdd3cdedcb95d99b37393fbaf
diff --git a/libselinux/Android.bp b/libselinux/Android.bp
index 51af69f..90dfe18 100644
--- a/libselinux/Android.bp
+++ b/libselinux/Android.bp
@@ -207,6 +207,11 @@
     shared: {
         shared_libs: ["libpcre2"],
     },
+
+    stubs: {
+        symbol_file: "exported.map",
+        versions: ["30"],
+    },
 }
 
 cc_binary_host {
diff --git a/libselinux/exported.map b/libselinux/exported.map
index fbc8acc..89a3117 100644
--- a/libselinux/exported.map
+++ b/libselinux/exported.map
@@ -1,4 +1,4 @@
-{
+LIBSELINUX_R {
   global:
     fgetfilecon;
     fgetfilecon_raw;