diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-04-07 12:44:51 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2015-04-07 14:01:43 -0700 |
| commit | 19803807cd7ae01868fcfa50305f4a7dd13765e2 (patch) | |
| tree | a06b7fc1822d53c8891a27e39b5e27e50d873667 /cmds/installd/installd.h | |
| parent | e23a13299a4f6f2488935b4786cdbb46f46e3d3c (diff) | |
| download | frameworks_native-19803807cd7ae01868fcfa50305f4a7dd13765e2.zip frameworks_native-19803807cd7ae01868fcfa50305f4a7dd13765e2.tar.gz frameworks_native-19803807cd7ae01868fcfa50305f4a7dd13765e2.tar.bz2 | |
Switch installd to compile as C++.
This is the minimal change needed to switch it over to C++, which
paves the way for using more robust utilities like std::string.
Change-Id: I80ed6280146875eb6ddbbb340c05450388ca13f0
Diffstat (limited to 'cmds/installd/installd.h')
| -rw-r--r-- | cmds/installd/installd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/installd/installd.h b/cmds/installd/installd.h index 7c52b78..0ebc0ba 100644 --- a/cmds/installd/installd.h +++ b/cmds/installd/installd.h @@ -192,8 +192,8 @@ int validate_apk_path(const char *path); int append_and_increment(char** dst, const char* src, size_t* dst_size); -char *build_string2(char *s1, char *s2); -char *build_string3(char *s1, char *s2, char *s3); +char *build_string2(const char *s1, const char *s2); +char *build_string3(const char *s1, const char *s2, const char *s3); int ensure_dir(const char* path, mode_t mode, uid_t uid, gid_t gid); int ensure_media_user_dirs(userid_t userid); @@ -227,7 +227,7 @@ int mark_boot_complete(const char *instruction_set); int movefiles(); int linklib(const char* target, const char* source, int userId); int idmap(const char *target_path, const char *overlay_path, uid_t uid); -int restorecon_data(); +int restorecon_data(const char* pkgName, const char* seinfo, uid_t uid); int create_oat_dir(const char* oat_dir, const char *instruction_set); int rm_package_dir(const char* apk_path); int calculate_oat_file_path(char path[PKG_PATH_MAX], const char *oat_dir, const char *apk_path, |