Skip to content

GitLab

Commit 1382c5c8 authored by Mark Stevens's avatar Mark Stevens
Browse files

update from duco/rk312x_20160510 on rockchip-5.1.0_r5 branches

parent d25948b9
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 33 deletions
e2fsck/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -56,6 +56,20 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_profile_src_files)
LOCAL_STATIC_LIBRARIES := \
$(libext2_profile_system_shared_libraries) \
$(libext2_profile_shared_libraries)
LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
LOCAL_CFLAGS := $(libext2_profile_cflags)
LOCAL_PRELINK_MODULE := true
LOCAL_MODULE := libext2_profile
LOCAL_MODULE_TAGS := optional
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_profile_src_files)
LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_profile_shared_libraries))
LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
......@@ -98,6 +112,7 @@ e2fsck_src_files := \
sigcatcher.c
e2fsck_shared_libraries := \
libext2_quota \
libext2fs \
libext2_blkid \
libext2_uuid \
......@@ -142,14 +157,17 @@ e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing \
-DDISABLE_BACKTRACE=1
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES := \
$(e2fsck_system_shared_libraries) \
$(e2fsck_shared_libraries)
LOCAL_SRC_FILES := $(e2fsck_src_files)
LOCAL_C_INCLUDES := $(e2fsck_c_includes)
LOCAL_CFLAGS := $(e2fsck_cflags)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(e2fsck_system_shared_libraries)
LOCAL_SHARED_LIBRARIES := $(e2fsck_shared_libraries)
LOCAL_MODULE := e2fsck
LOCAL_MODULE_TAGS := optional
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
......
lib/blkid/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -19,10 +19,6 @@ libext2_blkid_shared_libraries := libext2_uuid
libext2_blkid_system_shared_libraries := libc
libext2_blkid_static_libraries := libext2_uuid_static
libext2_blkid_system_static_libraries := libc
libext2_blkid_c_includes := external/e2fsprogs/lib
libext2_blkid_cflags := -O2 -g -W -Wall -fno-strict-aliasing \
......@@ -68,11 +64,14 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES := \
$(libext2_blkid_system_shared_libraries) \
$(libext2_blkid_shared_libraries)
LOCAL_SRC_FILES := $(libext2_blkid_src_files)
LOCAL_STATIC_LIBRARIES := $(libext2_blkid_static_libraries) $(libext2_blkid_system_static_libraries)
LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux) -fno-strict-aliasing
LOCAL_PRELINK_MODULE := false
LOCAL_PRELINK_MODULE := true
LOCAL_MODULE := libext2_blkid
LOCAL_MODULE_TAGS := optional
......
lib/blkid/probe.c
View file @ 1382c5c8
......@@ -766,14 +766,41 @@ static int probe_ntfs(struct blkid_probe *probe,
if (attr_type == MFT_RECORD_ATTR_VOLUME_NAME) {
if (val_len > sizeof(label_str))
val_len = sizeof(label_str)-1;
/* $_rbox_$_modify_$_huangyonglin: added for mass storage mounting 2012-03-31 */
#if 0
for (i=0, cp=label_str; i < val_len; i+=2,cp++) {
val = ((__u8 *) attr) + val_off + i;
*cp = val[0];
if (val[1])
*cp = '?';
}
*cp = 0;
#else
for (i=0, cp=label_str; i < val_len;i+=2,cp++) {
__u16 *pval = ((__u8 *) attr) + val_off + i;
__u16 val_temp= *pval;
if (val_temp >= 0x00 && val_temp <= 0x7f)
{
val = ((__u8 *) attr) + val_off + i;
*cp =val[0];
}
else if (val_temp >= 0x0080 && val_temp <= 0x07ff)
{
*cp =((val_temp >> 6) & 0x1F) | 0xC0;
cp++;
*cp =(val_temp & 0x3F) | 0x80; ;
}
else if (val_temp >= 0x0800 && val_temp <= 0xffff)
{
*cp = ((val_temp >> 12) & 0x0F) | 0xE0; //0xe0 | (val_temp >> 12);
cp++;
*cp = ((val_temp >> 6) & 0x3F) | 0x80; //0x80 | (val_temp >> 6 & 0x00ff);
cp++;
*cp = (val_temp & 0x3F) | 0x80;//0x80 | (val_temp & (0xff >> 2));
}
}
*cp =0;
#endif
/*$_rbox_$_modify_$_end*/
}
}
......
lib/e2p/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -52,8 +52,6 @@ libext2_e2p_cflags := -O2 -g -W -Wall \
libext2_e2p_system_shared_libraries := libc
libext2_e2p_system_static_libraries := libc
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_e2p_src_files)
......@@ -71,8 +69,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_e2p_src_files)
LOCAL_C_INCLUDES := $(libext2_e2p_c_includes)
LOCAL_CFLAGS := $(libext2_e2p_cflags)
LOCAL_STATIC_LIBRARIES := $(libext2_e2p_system_static_libraries)
LOCAL_PRELINK_MODULE := false
LOCAL_STATIC_LIBRARIES := $(libext2_e2p_system_shared_libraries)
LOCAL_PRELINK_MODULE := true
LOCAL_MODULE := libext2_e2p
LOCAL_MODULE_TAGS := optional
......
lib/et/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -59,7 +59,7 @@ LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
LOCAL_STATIC_LIBRARIES := libc
LOCAL_MODULE := libext2_com_err
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := false
LOCAL_PRELINK_MODULE := true
include $(BUILD_STATIC_LIBRARY)
......
lib/ext2fs/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -80,14 +80,6 @@ libext2fs_shared_libraries := \
libext2fs_system_shared_libraries := libc
libext2fs_static_libraries := \
libext2_com_err \
libext2_uuid_static \
libext2_blkid \
libext2_e2p
libext2fs_system_static_libraries := libc
libext2fs_c_includes := external/e2fsprogs/lib
libext2fs_cflags := -O2 -g -W -Wall \
......@@ -132,12 +124,14 @@ LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES := \
$(libext2fs_system_shared_libraries) \
$(libext2fs_shared_libraries)
LOCAL_SRC_FILES := $(libext2fs_src_files)
LOCAL_STATIC_LIBRARIES := $(libext2fs_static_libraries) $(libext2fs_system_static_libraries)
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
LOCAL_PRELINK_MODULE := false
LOCAL_PRELINK_MODULE := true
LOCAL_MODULE := libext2fs
LOCAL_MODULE_TAGS := optional
......
lib/quota/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -37,8 +37,6 @@ libext2_quota_cflags := -O2 -g -W -Wall \
libext2_quota_shared_libraries := libext2fs libext2_com_err
libext2_quota_static_libraries := libext2fs libext2_com_err
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_quota_src_files)
......@@ -56,8 +54,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_quota_src_files)
LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
LOCAL_CFLAGS := $(libext2_quota_cflags)
LOCAL_STATIC_LIBRARIES := libc $(libext2_quota_static_libraries)
LOCAL_PRELINK_MODULE := false
LOCAL_STATIC_LIBRARIES := libc $(libext2_quota_shared_libraries)
LOCAL_PRELINK_MODULE := true
LOCAL_MODULE := libext2_quota
LOCAL_MODULE_TAGS := optional
......
lib/uuid/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -58,6 +58,18 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
LOCAL_STATIC_LIBRARIES := $(libext2_uuid_system_shared_libraries)
LOCAL_MODULE := libext2_uuid
LOCAL_MODULE_TAGS := optional
LOCAL_PRELINK_MODULE := true
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
......
misc/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -44,6 +44,7 @@ mke2fs_cflags_linux := \
mke2fs_cflags += -DNO_CHECK_BB
mke2fs_shared_libraries := \
libext2_quota \
libext2fs \
libext2_blkid \
libext2_uuid \
......@@ -56,13 +57,17 @@ mke2fs_system_shared_libraries := libc
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES := \
$(mke2fs_system_shared_libraries) \
$(mke2fs_shared_libraries)
LOCAL_SRC_FILES := $(mke2fs_src_files)
LOCAL_C_INCLUDES := $(mke2fs_c_includes)
LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(mke2fs_system_shared_libraries)
LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
LOCAL_MODULE := mke2fs
LOCAL_MODULE_TAGS := optional
LOCAL_FORCE_STATIC_EXECUTABLE := true
#LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
......
resize/Android.mk 100644 → 100755
View file @ 1382c5c8
......@@ -46,14 +46,17 @@ resize2fs_shared_libraries := \
resize2fs_system_shared_libraries := libc
include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES := \
$(resize2fs_shared_libraries) \
$(resize2fs_system_shared_libraries)
LOCAL_SRC_FILES := $(resize2fs_src_files)
LOCAL_C_INCLUDES := $(resize2fs_c_includes)
LOCAL_CFLAGS := $(resize2fs_cflags)
LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(resize2fs_system_shared_libraries)
LOCAL_MODULE := resize2fs
LOCAL_MODULE_TAGS := optional
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment