Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e5c1714 authored by Bo Hu's avatar Bo Hu Committed by android-build-merger
Browse files

Merge "goldfish: support system_ext" am: 9432b4d0 am: 75e29ad5 am: 815a6e9b am: 1c8b101c 

am: 877051f7

Change-Id: Idff752c4b5fe52e1676a140d404464696f8883ad
parents 733dadc8 877051f7

target/board/BoardConfigEmuCommon.mk

+17 −3
Original line number Diff line number Diff line
@@ -35,10 +35,24 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true) 
  # 3G + header

  BOARD_SUPER_PARTITION_SIZE := 3229614080

  BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions



  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

target/product/sdk_phone_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/sdk_phone_armv7.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/sdk_phone_x86.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/sdk_phone_x86_64.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)