Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master

am: f65d253f07

Change-Id: I5bc4ec7f1826cb3ded522967fd138eb0f4f59d3c
This commit is contained in:
Howard Chen 2019-08-19 18:35:46 -07:00 committed by android-build-merger
commit 3043018fd0
1 changed files with 2 additions and 2 deletions

View File

@ -54,8 +54,8 @@ PRODUCT_COPY_FILES += \
build/make/target/product/gsi/skip_mount.cfg:system/etc/init/config/skip_mount.cfg \
build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc \
# Support addtional P VNDK packages
PRODUCT_EXTRA_VNDK_VERSIONS := 28
# Support addtional P and Q VNDK packages
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29
# The 64 bits GSI build targets inhiert core_64_bit.mk to enable 64 bits and
# include the init.zygote64_32.rc.