commit 312bc6519453bae78d380c1b6f6f73adc048a011
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 27 16:13:12 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 27 16:13:12 2020 +0000
tree 36f3e794f824e3ee466172d01bb966cfd3994330
parent e343f439a346caf46a820d4f17e07531dc079473
parent c708c3fa376ce5be23adc6fbde3dd7bfbf838d39

Merge changes I25df8eec,I493ff192 into rvc-dev

* changes:
  result.h - fix bugprone-suspicious-semicolon warning
  expected.h - fix bugprone-forwarding-reference-overload warnings

libstats/pull/Android.bp

diff --git a/libstats/pull/Android.bp b/libstats/pull/Android.bp
index c9f13a3..2658639 100644
--- a/libstats/pull/Android.bp
+++ b/libstats/pull/Android.bp
@@ -101,4 +101,5 @@
         "-Wno-unused-function",
         "-Wno-unused-parameter",
     ],
+    require_root: true,
 }

libstats/socket/Android.bp

diff --git a/libstats/socket/Android.bp b/libstats/socket/Android.bp
index 3f42088..f386243 100644
--- a/libstats/socket/Android.bp
+++ b/libstats/socket/Android.bp
@@ -131,4 +131,5 @@
             suffix: "64",
         }
     },
+    require_root: true,
 }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 8a66b0a..e80756e 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -544,8 +544,8 @@
     enter_default_mount_ns
 
     # /data/apex is now available. Start apexd to scan and activate APEXes.
-    mkdir /data/apex 0750 root system encryption=None
-    mkdir /data/apex/active 0750 root system
+    mkdir /data/apex 0755 root system encryption=None
+    mkdir /data/apex/active 0755 root system
     mkdir /data/apex/backup 0700 root system
     mkdir /data/apex/hashtree 0700 root system
     mkdir /data/apex/sessions 0700 root system