commit 9a84b553e89b399977252a2c8474bce4062e7bb6
author Geremy Condra <gcondra@google.com> Thu Mar 28 14:36:36 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 28 14:36:36 2013 -0700
tree ecdecf211859dad511ef3a0199b1f31d4b88e633
parent 15311e083034c5f4b9e85d2ac3c4c99f86de98b5
parent 83f9cdf0c8a374f98593440b07d0688b2fb91997

am 83f9cdf0: am 46e89912: am f19e045c: am c8df252f: Merge "run-as: Get seinfo from packages.list and pass to libselinux."

* commit '83f9cdf0c8a374f98593440b07d0688b2fb91997':
  run-as: Get seinfo from packages.list and pass to libselinux.

include/cutils/bitops.h

diff --git a/include/cutils/bitops.h b/include/cutils/bitops.h
index eb44236..c26dc54 100644
--- a/include/cutils/bitops.h
+++ b/include/cutils/bitops.h
@@ -75,6 +75,16 @@
     return -1;
 }
 
+static inline int bitmask_weight(unsigned int *bitmask, int num_bits)
+{
+    int i;
+    int weight = 0;
+
+    for (i = 0; i < BITS_TO_WORDS(num_bits); i++)
+        weight += __builtin_popcount(bitmask[i]);
+    return weight;
+}
+
 static inline void bitmask_set(unsigned int *bitmask, int bit)
 {
     bitmask[BIT_WORD(bit)] |= BIT_MASK(bit);

toolbox/rm.c

diff --git a/toolbox/rm.c b/toolbox/rm.c
index 3a24bec..127cbc4 100644
--- a/toolbox/rm.c
+++ b/toolbox/rm.c
@@ -103,8 +103,8 @@
             ret = unlink_recursive(argv[i], flags);
         } else {
             ret = unlink(argv[i]);
-            if (errno == ENOENT && (flags & OPT_FORCE)) {
-                return 0;
+            if (ret < 0 && errno == ENOENT && (flags & OPT_FORCE)) {
+                continue;
             }
         }