diff --git a/apex/deapexer.go b/apex/deapexer.go index fed9cd1f0..3b7c77dc9 100644 --- a/apex/deapexer.go +++ b/apex/deapexer.go @@ -140,7 +140,6 @@ func (p *Deapexer) GenerateAndroidBuildActions(ctx android.ModuleContext) { Tool(android.PathForSource(ctx, "build/soong/scripts/unpack-prebuilt-apex.sh")). BuiltTool("deapexer"). BuiltTool("debugfs"). - BuiltTool("blkid"). BuiltTool("fsck.erofs"). Input(p.inputApex). Text(deapexerOutput.String()) diff --git a/scripts/unpack-prebuilt-apex.sh b/scripts/unpack-prebuilt-apex.sh index b244f7950..2a20e452a 100755 --- a/scripts/unpack-prebuilt-apex.sh +++ b/scripts/unpack-prebuilt-apex.sh @@ -18,17 +18,16 @@ set -eu # Tool to unpack an apex file and verify that the required files were extracted. if [ $# -lt 7 ]; then - echo "usage: $0 +" >&2 + echo "usage: $0 +" >&2 exit 1 fi DEAPEXER_PATH=$1 DEBUGFS_PATH=$2 -BLKID_PATH=$3 -FSCK_EROFS_PATH=$4 -APEX_FILE=$5 -OUTPUT_DIR=$6 -shift 6 +FSCK_EROFS_PATH=$3 +APEX_FILE=$4 +OUTPUT_DIR=$5 +shift 5 REQUIRED_PATHS=$@ rm -fr $OUTPUT_DIR @@ -36,7 +35,6 @@ mkdir -p $OUTPUT_DIR # Unpack the apex file contents. $DEAPEXER_PATH --debugfs_path $DEBUGFS_PATH \ - --blkid_path $BLKID_PATH \ --fsckerofs_path $FSCK_EROFS_PATH \ extract $APEX_FILE $OUTPUT_DIR