diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 20:17:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 20:17:11 +0000 |
commit | de5a53756212bc518d2a3aa433d90e1b22efa7af (patch) | |
tree | 63e61a4796b350148cc1cd81d985d6942fa72885 | |
parent | 24df0a87d1ea572091a6a0199c08f8481e8e35a3 (diff) | |
parent | 7b6c0c3b1354c09ccdb4b21648a3ce6dea588301 (diff) | |
download | extras-android-8.1.0_r36.tar.gz |
release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4367109 snap-temp-L18300000107415568android-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: If7f9b0714614385149b21a000a780f1d62d51283
-rwxr-xr-x | ext4_utils/mkuserimg_mke2fs.sh | 35 | ||||
-rw-r--r-- | tests/kernel.config/Android.mk | 2 |
2 files changed, 31 insertions, 6 deletions
diff --git a/ext4_utils/mkuserimg_mke2fs.sh b/ext4_utils/mkuserimg_mke2fs.sh index 64b1fe3f..ea73ff70 100755 --- a/ext4_utils/mkuserimg_mke2fs.sh +++ b/ext4_utils/mkuserimg_mke2fs.sh @@ -8,7 +8,8 @@ Usage: mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>] [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE] [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL] - [-i INODES ] [-e ERASE_BLOCK_SIZE] [-o FLASH_BLOCK_SIZE] [FILE_CONTEXTS] + [-i INODES ] [-e ERASE_BLOCK_SIZE] [-o FLASH_BLOCK_SIZE] + [-U MKE2FS_UUID] [-S MKE2FS_HASH_SEED] [FILE_CONTEXTS] EOT } @@ -17,6 +18,7 @@ BLOCKSIZE=4096 MKE2FS_OPTS="" MKE2FS_EXTENDED_OPTS="" E2FSDROID_OPTS="" +E2FSPROGS_FAKE_TIME="" if [ "$1" = "-s" ]; then MKE2FS_EXTENDED_OPTS+="android_sparse" @@ -53,6 +55,7 @@ fi if [[ "$1" == "-T" ]]; then E2FSDROID_OPTS+=" -T $2" + E2FSPROGS_FAKE_TIME=$2 shift; shift fi @@ -108,6 +111,19 @@ if [[ "$1" == "-o" ]]; then shift; shift fi +if [[ "$1" == "-U" ]]; then + MKE2FS_OPTS+=" -U $2" + shift; shift +fi + +if [[ "$1" == "-S" ]]; then + if [[ $MKE2FS_EXTENDED_OPTS ]]; then + MKE2FS_EXTENDED_OPTS+="," + fi + MKE2FS_EXTENDED_OPTS+="hash_seed=$2" + shift; shift +fi + if [[ $MKE2FS_EXTENDED_OPTS ]]; then MKE2FS_OPTS+=" -E $MKE2FS_EXTENDED_OPTS" fi @@ -141,16 +157,25 @@ SIZE=$((SIZE / BLOCKSIZE)) # truncate output file since mke2fs will keep verity section in existing file cat /dev/null >$OUTPUT_FILE +MAKE_EXT4FS_ENV="MKE2FS_CONFIG=./system/extras/ext4_utils/mke2fs.conf" +if [[ $E2FSPROGS_FAKE_TIME ]]; then + MAKE_EXT4FS_ENV+=" E2FSPROGS_FAKE_TIME=$E2FSPROGS_FAKE_TIME" +fi + MAKE_EXT4FS_CMD="mke2fs $MKE2FS_OPTS -t $EXT_VARIANT -b $BLOCKSIZE $OUTPUT_FILE $SIZE" -echo $MAKE_EXT4FS_CMD -MKE2FS_CONFIG=./system/extras/ext4_utils/mke2fs.conf $MAKE_EXT4FS_CMD +echo $MAKE_EXT4FS_ENV $MAKE_EXT4FS_CMD +env $MAKE_EXT4FS_ENV $MAKE_EXT4FS_CMD if [ $? -ne 0 ]; then exit 4 fi +if [[ $E2FSPROGS_FAKE_TIME ]]; then + E2FSDROID_ENV="E2FSPROGS_FAKE_TIME=$E2FSPROGS_FAKE_TIME" +fi + E2FSDROID_CMD="e2fsdroid $E2FSDROID_OPTS -f $SRC_DIR -a $MOUNT_POINT $OUTPUT_FILE" -echo $E2FSDROID_CMD -$E2FSDROID_CMD +echo $E2FSDROID_ENV $E2FSDROID_CMD +env $E2FSDROID_ENV $E2FSDROID_CMD if [ $? -ne 0 ]; then rm -f $OUTPUT_FILE exit 4 diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index 44d7931f..a9def5e3 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -18,7 +18,6 @@ cts_src_files := \ logger_test.cpp \ multicast_test.cpp \ nfs_test.cpp \ - pstore_test.cpp \ sysvipc_test.cpp \ # Required plus Recommended Tests @@ -28,6 +27,7 @@ test_src_files := \ aslr_test.cpp \ aslr_rec_test.cpp \ mmc_max_speed_test.cpp \ + pstore_test.cpp \ include $(CLEAR_VARS) LOCAL_MODULE := kernel-config-unit-tests |