Merge "goldfish: support system_ext"
This commit is contained in:
@@ -35,9 +35,23 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
|
|||||||
# 3G + header
|
# 3G + header
|
||||||
BOARD_SUPER_PARTITION_SIZE := 3229614080
|
BOARD_SUPER_PARTITION_SIZE := 3229614080
|
||||||
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
|
BOARD_SUPER_PARTITION_GROUPS := emulator_dynamic_partitions
|
||||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
|
||||||
system \
|
ifeq ($(QEMU_USE_SYSTEM_EXT_PARTITIONS),true)
|
||||||
vendor
|
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
|
# 3G
|
||||||
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
|
BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE := 3221225472
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk)
|
||||||
|
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk)
|
||||||
|
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk)
|
||||||
|
|
||||||
|
@@ -13,6 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
QEMU_USE_SYSTEM_EXT_PARTITIONS := true
|
||||||
|
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user