diff options
| author | 2022-12-12 21:08:55 +0000 | |
|---|---|---|
| committer | 2022-12-12 21:08:55 +0000 | |
| commit | a499dfdf95a7d84b7b9363131840bd00feee1d8e (patch) | |
| tree | 2c3b105893658fc6cee54abba9143ea8df34147d | |
| parent | 18ac53b4d0dac5183eeb9ce7ebc76c76388c32e2 (diff) | |
| parent | e17c31611a495a3afb85a7ad822f2b0d96478a58 (diff) | |
Merge "Fix deapexer usage in prebuilt_apex/apex_set"
| -rw-r--r-- | apex/deapexer.go | 2 | ||||
| -rwxr-xr-x | scripts/unpack-prebuilt-apex.sh | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/apex/deapexer.go b/apex/deapexer.go index 8c9030a85..fed9cd1f0 100644 --- a/apex/deapexer.go +++ b/apex/deapexer.go @@ -140,6 +140,8 @@ 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()) for _, p := range exportedPaths { diff --git a/scripts/unpack-prebuilt-apex.sh b/scripts/unpack-prebuilt-apex.sh index f34a480c9..b244f7950 100755 --- a/scripts/unpack-prebuilt-apex.sh +++ b/scripts/unpack-prebuilt-apex.sh @@ -17,23 +17,28 @@ set -eu # limitations under the License. # Tool to unpack an apex file and verify that the required files were extracted. -if [ $# -lt 5 ]; then - echo "usage: $0 <deapaxer_path> <debugfs_path> <apex file> <output_dir> <required_files>+" >&2 +if [ $# -lt 7 ]; then + echo "usage: $0 <deapaxer_path> <debugfs_path> <blkid_path> <fsck.erofs_path> <apex file> <output_dir> <required_files>+" >&2 exit 1 fi DEAPEXER_PATH=$1 DEBUGFS_PATH=$2 -APEX_FILE=$3 -OUTPUT_DIR=$4 -shift 4 +BLKID_PATH=$3 +FSCK_EROFS_PATH=$4 +APEX_FILE=$5 +OUTPUT_DIR=$6 +shift 6 REQUIRED_PATHS=$@ rm -fr $OUTPUT_DIR mkdir -p $OUTPUT_DIR # Unpack the apex file contents. -$DEAPEXER_PATH --debugfs_path $DEBUGFS_PATH extract $APEX_FILE $OUTPUT_DIR +$DEAPEXER_PATH --debugfs_path $DEBUGFS_PATH \ + --blkid_path $BLKID_PATH \ + --fsckerofs_path $FSCK_EROFS_PATH \ + extract $APEX_FILE $OUTPUT_DIR # Verify that the files that the build expects to be in the .apex file actually # exist, and make sure they have a fresh mtime to not confuse ninja. |