diff options
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | build/apex/Android.bp | 4 | ||||
| -rwxr-xr-x | build/apex/art_apex_test.py | 2 | ||||
| -rwxr-xr-x | build/apex/runtests.sh | 2 | ||||
| -rwxr-xr-x | tools/buildbot-build.sh | 2 | ||||
| -rwxr-xr-x | tools/buildbot-sync.sh | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index bc2f431ec0..bfe1376804 100644 --- a/Android.mk +++ b/Android.mk @@ -553,7 +553,7 @@ define extract-from-apex rm -rf $$apex_dir && \ mkdir -p $$apex_dir && \ debugfs=$(HOST_OUT)/bin/debugfs_static && \ - blkid=$(HOST_OUT)/bin/blkid && \ + blkid=$(HOST_OUT)/bin/blkid_static && \ fsckerofs=$(HOST_OUT)/bin/fsck.erofs && \ $(HOST_OUT)/bin/deapexer --debugfs_path $$debugfs --blkid_path $$blkid \ --fsckerofs_path $$fsckerofs extract $$apex_file $$apex_dir; \ diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 07b37f97ea..04ab94343b 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -524,7 +524,7 @@ art_check_apex_gen_stem = "$(location art-apex-tester)" + " --deapexer $(location deapexer)" + " --debugfs $(location debugfs_static)" + " --fsckerofs $(location fsck.erofs)" + - " --blkid $(location blkid)" + + " --blkid $(location blkid_static)" + " --tmpdir $(genDir)" // The non-flattened APEXes are always checked, as they are always generated @@ -534,7 +534,7 @@ genrule_defaults { defaults: ["art_module_source_build_genrule_defaults"], tools: [ "art-apex-tester", - "blkid", + "blkid_static", "deapexer", "debugfs_static", "fsck.erofs", diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index 900ada7926..41b587fab3 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -1032,7 +1032,7 @@ def art_apex_test_default(test_parser): test_args = test_parser.parse_args(['unused']) # For consistency. test_args.debugfs = '%s/bin/debugfs' % host_out test_args.fsckerofs = '%s/bin/fsck.erofs' % host_out - test_args.blkid = '%s/bin/blkid' % host_out + test_args.blkid = '%s/bin/blkid_static' % host_out test_args.tmpdir = '.' test_args.tree = False test_args.list = False diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh index 9e6167a188..290f121b7f 100755 --- a/build/apex/runtests.sh +++ b/build/apex/runtests.sh @@ -207,7 +207,7 @@ for apex_module in ${apex_modules[@]}; do art_apex_test_args="$art_apex_test_args --deapexer $HOST_OUT/bin/deapexer" art_apex_test_args="$art_apex_test_args --debugfs $HOST_OUT/bin/debugfs_static" art_apex_test_args="$art_apex_test_args --fsckerofs $HOST_OUT/bin/fsck.erofs" - art_apex_test_args="$art_apex_test_args --blkid $HOST_OUT/bin/blkid" + art_apex_test_args="$art_apex_test_args --blkid $HOST_OUT/bin/blkid_static" fi case $apex_module in (*.debug) test_only_args="--flavor debug";; diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index d540d74363..cad218f4d5 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -169,7 +169,7 @@ if [[ $build_target == "yes" ]]; then # Extract prebuilt APEXes. debugfs=$ANDROID_HOST_OUT/bin/debugfs_static fsckerofs=$ANDROID_HOST_OUT/bin/fsck.erofs - blkid=$ANDROID_HOST_OUT/bin/blkid + blkid=$ANDROID_HOST_OUT/bin/blkid_static for apex in ${apexes[@]}; do dir="$ANDROID_PRODUCT_OUT/system/apex/${apex}" apexbase="$ANDROID_PRODUCT_OUT/system/apex/${apex}" diff --git a/tools/buildbot-sync.sh b/tools/buildbot-sync.sh index afc0691984..ba49c6164e 100755 --- a/tools/buildbot-sync.sh +++ b/tools/buildbot-sync.sh @@ -96,7 +96,7 @@ activate_apex() { mkdir -p $src_apex_path $ANDROID_HOST_OUT/bin/deapexer --debugfs_path $ANDROID_HOST_OUT/bin/debugfs_static \ --fsckerofs_path $ANDROID_HOST_OUT/bin/fsck.erofs \ - --blkid_path $ANDROID_HOST_OUT/bin/blkid \ + --blkid_path $ANDROID_HOST_OUT/bin/blkid_static \ extract ${src_apex_file} $src_apex_path fi |