aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.version3
-rw-r--r--e2fsck/Android.mk12
-rw-r--r--e2fsck/e2fsck.c4
-rw-r--r--e2fsck/pass2.c37
-rw-r--r--e2fsck/problem.c5
-rw-r--r--e2fsck/problem.h3
-rw-r--r--lib/blkid/Android.mk4
-rw-r--r--lib/e2p/Android.mk2
-rw-r--r--lib/et/Android.mk2
-rw-r--r--lib/ext2fs/Android.mk18
-rw-r--r--lib/ext2fs/ext2_fs.h1
-rw-r--r--lib/ext2fs/ext2fs.h3
-rw-r--r--lib/quota/Android.mk4
-rw-r--r--lib/uuid/Android.mk6
-rw-r--r--misc/Android.mk28
-rw-r--r--misc/tune2fs.h13
-rw-r--r--resize/Android.mk2
17 files changed, 100 insertions, 47 deletions
diff --git a/README.version b/README.version
new file mode 100644
index 00000000..851c4e84
--- /dev/null
+++ b/README.version
@@ -0,0 +1,3 @@
+URL: https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.42.9/e2fsprogs-1.42.9.tar.gz
+Version: 1.42.9
+BugComponent: 95221
diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index b4b2aef9..0789298d 100644
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -37,7 +37,7 @@ libext2_profile_cflags := -O2 -g -W -Wall \
-DHAVE_LINUX_FD_H \
-DHAVE_TYPE_SSIZE_T \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF \
-DDISABLE_BACKTRACE=1
@@ -56,10 +56,10 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_profile_src_files)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_profile_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_profile_shared_libraries))
LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
LOCAL_CFLAGS := $(libext2_profile_cflags)
-LOCAL_MODULE := libext2_profile_host
+LOCAL_MODULE := libext2_profile-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
@@ -106,7 +106,7 @@ e2fsck_shared_libraries := \
libext2_e2p
e2fsck_system_shared_libraries := libc
-e2fsck_c_includes := external/e2fsprogs/lib
+e2fsck_c_includes :=
e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing \
-DHAVE_DIRENT_H \
@@ -136,7 +136,7 @@ e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing \
-DHAVE_INTPTR_T \
-DENABLE_HTREE=1 \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF \
-DDISABLE_BACKTRACE=1
@@ -156,7 +156,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(e2fsck_src_files)
LOCAL_C_INCLUDES := $(e2fsck_c_includes)
LOCAL_CFLAGS := $(e2fsck_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2fsck_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e2fsck_shared_libraries))
LOCAL_MODULE := e2fsck_host
LOCAL_MODULE_STEM := e2fsck
LOCAL_MODULE_TAGS := optional
diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
index 36931244..1be6b5e1 100644
--- a/e2fsck/e2fsck.c
+++ b/e2fsck/e2fsck.c
@@ -139,6 +139,10 @@ errcode_t e2fsck_reset_context(e2fsck_t ctx)
ext2fs_free_mem(&ctx->invalid_inode_table_flag);
ctx->invalid_inode_table_flag = 0;
}
+ if (ctx->encrypted_dirs) {
+ ext2fs_u32_list_free(ctx->encrypted_dirs);
+ ctx->encrypted_dirs = 0;
+ }
/* Clear statistic counters */
ctx->fs_directory_count = 0;
diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c
index b6066573..16a4da72 100644
--- a/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@ -464,19 +464,32 @@ static int check_name(e2fsck_t ctx,
int ret = 0;
for ( i = 0; i < (dirent->name_len & 0xFF); i++) {
- if (dirent->name[i] == '/' || dirent->name[i] == '\0') {
- if (fixup < 0) {
- fixup = fix_problem(ctx, PR_2_BAD_NAME, pctx);
- }
- if (fixup) {
- dirent->name[i] = '.';
- ret = 1;
- }
- }
+ if (dirent->name[i] != '/' && dirent->name[i] != '\0')
+ continue;
+ if (fixup < 0)
+ fixup = fix_problem(ctx, PR_2_BAD_NAME, pctx);
+ if (fixup == 0)
+ return 0;
+ dirent->name[i] = '.';
+ ret = 1;
}
return ret;
}
+static int encrypted_check_name(e2fsck_t ctx,
+ struct ext2_dir_entry *dirent,
+ struct problem_context *pctx)
+{
+ if ((dirent->name_len & 0xff) < EXT4_CRYPTO_BLOCK_SIZE) {
+ if (fix_problem(ctx, PR_2_BAD_ENCRYPTED_NAME, pctx)) {
+ dirent->inode = 0;
+ return 1;
+ }
+ ext2fs_unmark_valid(ctx->fs);
+ }
+ return 0;
+}
+
/*
* Check the directory filetype (if present)
*/
@@ -1041,6 +1054,12 @@ out_htree:
if (!encrypted && check_name(ctx, dirent, &cd->pctx))
dir_modified++;
+ if (encrypted && (dot_state) > 1 &&
+ encrypted_check_name(ctx, dirent, &cd->pctx)) {
+ dir_modified++;
+ goto next;
+ }
+
if (check_filetype(ctx, dirent, ino, &cd->pctx))
dir_modified++;
diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 2fdc8d22..833115a7 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -1391,6 +1391,11 @@ static struct e2fsck_problem problem_table[] = {
N_("i_file_acl_hi @F %N, @s zero.\n"),
PROMPT_CLEAR, PR_PREEN_OK },
+ /* Encrypted directory entry is too short */
+ { PR_2_BAD_ENCRYPTED_NAME,
+ N_("Encrypted @E is too short.\n"),
+ PROMPT_CLEAR, 0 },
+
/* Pass 3 errors */
/* Pass 3: Checking directory connectivity */
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index 240326e5..aea5abc5 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -833,6 +833,9 @@ struct problem_context {
/* i_file_acl_hi should be zero */
#define PR_2_I_FILE_ACL_HI_ZERO 0x020048
+/* Encrypted directory entry is too short */
+#define PR_2_BAD_ENCRYPTED_NAME 0x020050
+
/*
* Pass 3 errors
*/
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 7682ce1a..c64d4144 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -79,14 +79,14 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_blkid_src_files)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_blkid_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_blkid_shared_libraries))
LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
ifeq ($(HOST_OS),linux)
LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
else
LOCAL_CFLAGS := $(libext2_blkid_cflags)
endif
-LOCAL_MODULE := libext2_blkid_host
+LOCAL_MODULE := libext2_blkid-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk
index 5a89b382..b91b7c0c 100644
--- a/lib/e2p/Android.mk
+++ b/lib/e2p/Android.mk
@@ -81,7 +81,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_e2p_src_files)
LOCAL_C_INCLUDES := $(libext2_e2p_c_includes)
LOCAL_CFLAGS := $(libext2_e2p_cflags)
-LOCAL_MODULE := libext2_e2p_host
+LOCAL_MODULE := libext2_e2p-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index 7724bb15..999d8fc2 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -70,7 +70,7 @@ LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
else
LOCAL_CFLAGS := $(libext2_com_err_cflags)
endif
-LOCAL_MODULE := libext2_com_err_host
+LOCAL_MODULE := libext2_com_err-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index 467ca7e0..05a3079d 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -16,9 +16,9 @@ libext2fs_src_files := \
block.c \
bmap.c \
check_desc.c \
+ closefs.c \
crc16.c \
csum.c \
- closefs.c \
dblist.c \
dblist_dir.c \
dirblock.c \
@@ -48,26 +48,29 @@ libext2fs_src_files := \
link.c \
llseek.c \
lookup.c \
- mmp.c \
mkdir.c \
mkjournal.c \
+ mmp.c \
+ namei.c \
native.c \
newdir.c \
openfs.c \
progress.c \
punch.c \
- rbtree.c \
+ qcow2.c \
read_bb.c \
read_bb_file.c \
res_gdt.c \
rw_bitmaps.c \
swapfs.c \
+ symlink.c \
tdb.c \
undo_io.c \
unix_io.c \
unlink.c \
valid_blk.c \
- version.c
+ version.c \
+ rbtree.c
# get rid of this?!
libext2fs_src_files += test_io.c
@@ -124,6 +127,7 @@ LOCAL_SRC_FILES := $(libext2fs_src_files)
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2fs_system_shared_libraries)
LOCAL_SHARED_LIBRARIES := $(libext2fs_shared_libraries)
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
LOCAL_MODULE := libext2fs
LOCAL_MODULE_TAGS := optional
@@ -135,6 +139,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2fs_src_files)
LOCAL_STATIC_LIBRARIES := $(libext2fs_static_libraries) $(libext2fs_system_static_libraries)
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
LOCAL_MODULE := libext2fs
LOCAL_MODULE_TAGS := optional
@@ -144,14 +149,15 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2fs_src_files)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2fs_shared_libraries))
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
ifeq ($(HOST_OS),linux)
LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
else
LOCAL_CFLAGS := $(libext2fs_cflags)
endif
-LOCAL_MODULE := libext2fs_host
+LOCAL_MODULE := libext2fs-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 6847b46a..fad71181 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -550,6 +550,7 @@ struct ext2_inode_large {
#define EXT4_MAX_KEY_SIZE 64
#define EXT4_KEY_DESCRIPTOR_SIZE 8
+#define EXT4_CRYPTO_BLOCK_SIZE 16
/* Password derivation constants */
#define EXT4_MAX_PASSPHRASE_SIZE 1024
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index e013fbb7..7f3b7926 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -536,6 +536,9 @@ typedef struct ext2_icount *ext2_icount_t;
if ((struct)->magic != (code)) return (code)
+#define EXT2FS_SHA256_LENGTH 32
+#define EXT2FS_DIGEST_SIZE EXT2FS_SHA256_LENGTH
+
/*
* For ext2 compression support
*/
diff --git a/lib/quota/Android.mk b/lib/quota/Android.mk
index ef599eab..d102ec30 100644
--- a/lib/quota/Android.mk
+++ b/lib/quota/Android.mk
@@ -66,8 +66,8 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_quota_src_files)
LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
LOCAL_CFLAGS := $(libext2_quota_cflags)
-LOCAL_MODULE := libext2_quota_host
+LOCAL_MODULE := libext2_quota-host
LOCAL_MODULE_TAGS := optional
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_quota_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(libext2_quota_shared_libraries))
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk
index a43a3619..b26521e4 100644
--- a/lib/uuid/Android.mk
+++ b/lib/uuid/Android.mk
@@ -49,7 +49,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_uuid_src_files)
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/..
LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_uuid_system_shared_libraries)
LOCAL_MODULE := libext2_uuid
LOCAL_MODULE_TAGS := optional
@@ -62,7 +62,7 @@ LOCAL_SRC_FILES := $(libext2_uuid_src_files)
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_MODULE := libext2_uuid_host
+LOCAL_MODULE := libext2_uuid-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_SHARED_LIBRARY)
@@ -87,7 +87,7 @@ LOCAL_SRC_FILES := $(libext2_uuid_src_files)
LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
LOCAL_CFLAGS := $(libext2_uuid_cflags)
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
-LOCAL_MODULE := libext2_uuid_host
+LOCAL_MODULE := libext2_uuid-host
LOCAL_MODULE_TAGS := optional
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/misc/Android.mk b/misc/Android.mk
index 645fc9cc..79ba61d9 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -8,7 +8,6 @@ mke2fs_src_files := \
default_profile.c
mke2fs_c_includes := \
- external/e2fsprogs/lib \
external/e2fsprogs/e2fsck
mke2fs_cflags := -O2 -g -W -Wall \
@@ -32,7 +31,7 @@ mke2fs_cflags := -O2 -g -W -Wall \
-DHAVE_TYPE_SSIZE_T \
-DHAVE_GETOPT_H \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF
mke2fs_cflags_linux := \
@@ -74,7 +73,7 @@ LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux)
else
LOCAL_CFLAGS := $(mke2fs_cflags)
endif
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(mke2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(mke2fs_shared_libraries))
LOCAL_MODULE := mke2fs_host
LOCAL_MODULE_STEM := mke2fs
LOCAL_MODULE_TAGS := optional
@@ -89,7 +88,6 @@ tune2fs_src_files := \
util.c
tune2fs_c_includes := \
- external/e2fsprogs/lib \
external/e2fsprogs/e2fsck
tune2fs_cflags := -O2 -g -W -Wall \
@@ -117,7 +115,7 @@ tune2fs_cflags := -O2 -g -W -Wall \
-DHAVE_TYPE_SSIZE_T \
-DHAVE_GETOPT_H \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF
tune2fs_cflags += -DNO_CHECK_BB
@@ -183,7 +181,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(tune2fs_src_files)
LOCAL_C_INCLUDES := $(tune2fs_c_includes)
LOCAL_CFLAGS := $(tune2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(tune2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(tune2fs_shared_libraries))
LOCAL_MODULE := tune2fs_host
LOCAL_MODULE_STEM := tune2fs
LOCAL_MODULE_TAGS := optional
@@ -198,8 +196,7 @@ include $(CLEAR_VARS)
badblocks_src_files := \
badblocks.c
-badblocks_c_includes := \
- external/e2fsprogs/lib
+badblocks_c_includes :=
badblocks_cflags := -O2 -g -W -Wall \
-DHAVE_UNISTD_H \
@@ -226,7 +223,7 @@ badblocks_cflags := -O2 -g -W -Wall \
-DHAVE_TYPE_SSIZE_T \
-DHAVE_GETOPT_H \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF
badblocks_shared_libraries := \
@@ -255,7 +252,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(badblocks_src_files)
LOCAL_C_INCLUDES := $(badblocks_c_includes)
LOCAL_CFLAGS := $(badblocks_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(badblocks_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(badblocks_shared_libraries))
LOCAL_MODULE := badblocks_host
LOCAL_MODULE_STEM := badblocks
LOCAL_MODULE_TAGS := optional
@@ -298,7 +295,7 @@ chattr_cflags := -O2 -g -W -Wall \
-DHAVE_TYPE_SSIZE_T \
-DHAVE_GETOPT_H \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF
chattr_shared_libraries := \
@@ -324,7 +321,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(chattr_src_files)
LOCAL_C_INCLUDES := $(chattr_c_includes)
LOCAL_CFLAGS := $(chattr_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(chattr_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(chattr_shared_libraries))
LOCAL_MODULE := chattr_host
LOCAL_MODULE_STEM := chattr
LOCAL_MODULE_TAGS := optional
@@ -367,7 +364,7 @@ lsattr_cflags := -O2 -g -W -Wall \
-DHAVE_TYPE_SSIZE_T \
-DHAVE_GETOPT_H \
-DHAVE_SYS_TIME_H \
- -DHAVE_SYS_PARAM_H \
+ -DHAVE_SYS_PARAM_H \
-DHAVE_SYSCONF
lsattr_shared_libraries := \
@@ -393,7 +390,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(lsattr_src_files)
LOCAL_C_INCLUDES := $(lsattr_c_includes)
LOCAL_CFLAGS := $(lsattr_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(lsattr_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(lsattr_shared_libraries))
LOCAL_MODULE := lsattr_host
LOCAL_MODULE_STEM := lsattr
LOCAL_MODULE_TAGS := optional
@@ -408,8 +405,7 @@ include $(CLEAR_VARS)
blkid_src_files := \
blkid.c
-blkid_c_includes := \
- external/e2fsprogs/lib
+blkid_c_includes :=
blkid_cflags := -O2 -g -W -Wall \
-DHAVE_UNISTD_H \
diff --git a/misc/tune2fs.h b/misc/tune2fs.h
index 897e3363..7b7e431e 100644
--- a/misc/tune2fs.h
+++ b/misc/tune2fs.h
@@ -7,7 +7,20 @@
* %End-Header%
*/
+#ifndef _TUNE2FS_H_
+#define _TUNE2FS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Takes exactly the same args as the tune2fs exectuable.
* Is the entrypoint for libtune2fs.
*/
int tune2fs_main(int argc, char **argv);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/resize/Android.mk b/resize/Android.mk
index 41f9fe08..42b25cec 100644
--- a/resize/Android.mk
+++ b/resize/Android.mk
@@ -61,7 +61,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(resize2fs_src_files)
LOCAL_C_INCLUDES := $(resize2fs_c_includes)
LOCAL_CFLAGS := $(resize2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(resize2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(resize2fs_shared_libraries))
LOCAL_MODULE := resize2fs_host
LOCAL_MODULE_STEM := resize2fs
LOCAL_MODULE_TAGS := optional
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 17:50:34 +0000