commit 465fd635d505d2d5af9dfd409cb016fc9cac71d5
author Kenny Root <kroot@google.com> Mon Oct 22 16:19:52 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 22 16:19:52 2012 -0700
tree 1f11a3cc306ee7cea49626e4dac4ab43004a5452
parent 103dbdc5a6d61d4a47c6308cf0345e90ddbced23
parent 3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a

am 3ce8eb4e: am 55708a9d: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev

* commit '3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a':
  Clear data deletes too much

cmds/installd/commands.c

diff --git a/cmds/installd/commands.c b/cmds/installd/commands.c
index 4d49c8a..59bcda1 100644
--- a/cmds/installd/commands.c
+++ b/cmds/installd/commands.c
@@ -187,8 +187,8 @@
     if (create_pkg_path(pkgdir, pkgname, PKG_DIR_POSTFIX, persona))
         return -1;
 
-    /* delete contents AND directory, no exceptions */
-    return delete_dir_contents(pkgdir, 1, NULL);
+    /* delete contents, excluding "lib", but not the directory itself */
+    return delete_dir_contents(pkgdir, 0, "lib");
 }
 
 int make_user_data(const char *pkgname, uid_t uid, uid_t persona)