Merge "add -f option to mkbootfs to load file perms from file" into jb-dev
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 68928eb..5b556d6 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -138,7 +138,7 @@
#define android_id_count \
(sizeof(android_ids) / sizeof(android_ids[0]))
-
+
struct fs_path_config {
unsigned mode;
unsigned uid;
@@ -225,7 +225,7 @@
{ 00750, AID_ROOT, AID_SHELL, "init*" },
{ 00750, AID_ROOT, AID_SHELL, "charger*" },
{ 00750, AID_ROOT, AID_SHELL, "sbin/fs_mgr" },
- { 00640, AID_ROOT, AID_SHELL, "fstab.*" },
+ { 00644, AID_ROOT, AID_SHELL, "fstab.*" },
{ 00644, AID_ROOT, AID_ROOT, 0 },
};
@@ -234,7 +234,7 @@
{
struct fs_path_config *pc;
int plen;
-
+
pc = dir ? android_dirs : android_files;
plen = strlen(path);
for(; pc->prefix; pc++){
@@ -254,9 +254,9 @@
*uid = pc->uid;
*gid = pc->gid;
*mode = (*mode & (~07777)) | pc->mode;
-
+
#if 0
- fprintf(stderr,"< '%s' '%s' %d %d %o >\n",
+ fprintf(stderr,"< '%s' '%s' %d %d %o >\n",
path, pc->prefix ? pc->prefix : "", *uid, *gid, *mode);
#endif
}
diff --git a/liblog/Android.mk b/liblog/Android.mk
index bd2590e..be5cec2 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -41,7 +41,7 @@
liblog_host_sources := $(liblog_sources) fake_log_device.c
-# Static library for host
+# Shared and static library for host
# ========================================================
LOCAL_MODULE := liblog
LOCAL_SRC_FILES := $(liblog_host_sources)
@@ -49,6 +49,11 @@
LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
include $(BUILD_HOST_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+LOCAL_MODULE := liblog
+LOCAL_WHOLE_STATIC_LIBRARIES := liblog
+include $(BUILD_HOST_SHARED_LIBRARY)
+
# Static library for host, 64-bit
# ========================================================