diff options
| author | Andreas Gampe <agampe@google.com> | 2015-04-09 17:16:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 17:16:47 +0000 |
| commit | 6930a29af13f4a958fa7cba544233d2febe4040b (patch) | |
| tree | 76ce625c87a91378b630ce9afad4e1faecf6f409 /cmds | |
| parent | 65fe5dfdcd08650e0dfbb39f4a716567fb910cab (diff) | |
| parent | cae83eca2476c5f730aebaffdfb6443e6780bb2f (diff) | |
| download | frameworks_native-6930a29af13f4a958fa7cba544233d2febe4040b.zip frameworks_native-6930a29af13f4a958fa7cba544233d2febe4040b.tar.gz frameworks_native-6930a29af13f4a958fa7cba544233d2febe4040b.tar.bz2 | |
am cae83eca: am f9ab2ad2: Merge "Installd: Fix Clang build"
* commit 'cae83eca2476c5f730aebaffdfb6443e6780bb2f':
Installd: Fix Clang build
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/installd/commands.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cmds/installd/commands.cpp b/cmds/installd/commands.cpp index 73f707a..2d1965d 100644 --- a/cmds/installd/commands.cpp +++ b/cmds/installd/commands.cpp @@ -35,8 +35,6 @@ dir_rec_array_t android_system_dirs; int install(const char *uuid, const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) { - struct stat libStat; - if ((uid < AID_SYSTEM) || (gid < AID_SYSTEM)) { ALOGE("invalid uid/gid: %d %d\n", uid, gid); return -1; @@ -141,8 +139,6 @@ int delete_user_data(const char *uuid, const char *pkgname, userid_t userid) int make_user_data(const char *uuid, const char *pkgname, uid_t uid, userid_t userid, const char* seinfo) { - struct stat libStat; - std::string _pkgdir(create_package_data_path(uuid, pkgname, userid)); const char* pkgdir = _pkgdir.c_str(); @@ -1539,7 +1535,8 @@ fail: } // TODO: extend to know about other volumes -int restorecon_data(const char *uuid, const char* pkgName, const char* seinfo, uid_t uid) +int restorecon_data(const char* uuid __attribute__((unused)), const char* pkgName, + const char* seinfo, uid_t uid) { struct dirent *entry; DIR *d; |