Merge "goldfish: support system_ext" am: 9432b4d052
am: 75e29ad5d4
am: 815a6e9bf9
Change-Id: If58879cce28222e40716f4872bed1d1f6561643d
This commit is contained in:
commit
1c8b101c50
5 changed files with 21 additions and 3 deletions
|
@ -35,9 +35,23 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
|
|||
# 3G + header
|
||||
BOARD_SUPER_PARTITION_SIZE := 3229614080
|
||||
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||
system \
|
||||
vendor
|
||||
|
||||
ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||
system \
|
||||
system_ext \
|
||||
product \
|
||||
vendor
|
||||
|
||||
TARGET_COPY_OUT_PRODUCT := product
|
||||
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
TARGET_COPY_OUT_SYSTEM_EXT := system_ext
|
||||
BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
else
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||
system \
|
||||
vendor
|
||||
endif
|
||||
|
||||
# 3G
|
||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
|
||||
|
||||
|
|
Loading…
Reference in a new issue