commit 876252ff1dfef935b67f4b1e9b5623cf1efe7412
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 04 21:50:35 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 04 21:50:35 2019 +0000
tree a7f640ec30a9759cd190c630f26c8bfb72538f1a
parent 8bf284658eb13c9b9cea0dacee68f7a11e13a4c8
parent f866861c1f50304f88277a6dc2f599c112371827

Merge "build_image: Do not use base_fs file for system_other." am: c55b2f516c am: f866861c1f

Change-Id: I7fab7d75ce56087ae32f157917cd818abad74c06

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 317a6d9..1e7d387 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -585,7 +585,6 @@
     copy_prop("system_squashfs_compressor", "squashfs_compressor")
     copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")
     copy_prop("system_squashfs_block_size", "squashfs_block_size")
-    copy_prop("system_base_fs_file", "base_fs_file")
     copy_prop("system_extfs_inode_count", "extfs_inode_count")
     if not copy_prop("system_extfs_rsv_pct", "extfs_rsv_pct"):
       d["extfs_rsv_pct"] = "0"