From 11eadcc4ed629badd7154f5a10ce313e3d0fefec Mon Sep 17 00:00:00 2001 From: bohu Date: Thu, 29 Aug 2019 22:52:20 -0700 Subject: [PATCH] goldfish: support system_ext For sdk_phone_* targets only Change-Id: I4109a923a53311d09bafc2a0f5a70b2af4509cc3 --- target/board/BoardConfigEmuCommon.mk | 20 +++++++++++++++++--- target/product/sdk_phone_arm64.mk | 1 + target/product/sdk_phone_armv7.mk | 1 + target/product/sdk_phone_x86.mk | 1 + target/product/sdk_phone_x86_64.mk | 1 + 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index ac21918022..f941918e36 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -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 diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index 96f0bfd469..ad726333a7 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_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_arm64.mk) diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index 04d8d6a18e..77b8b50644 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.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) diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index b34e5b6dc2..b3e205c0d6 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_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.mk) diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 37c078e7cc..8062459248 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.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)