Merge "Fix boot failure on Q devices with GSI on master" into stage-aosp-master am: f65d253f07 am: 3043018fd0

am: bc7316fd0c

Change-Id: Ie0d76dc3b338cd88a027474899cbf3516fbacca2
This commit is contained in:
Howard Chen 2019-08-19 18:56:53 -07:00 committed by android-build-merger
commit 75ff1f880e

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.