forked from openkylin/platform_build
Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361 Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
This commit is contained in:
parent
80ca83c41f
commit
16e7004e3f
|
@ -14,7 +14,7 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
include device/generic/goldfish/arm32-vendor.mk
|
||||
-include device/generic/goldfish/arm32-vendor.mk
|
||||
|
||||
# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
# build quite specifically for the emulator, and might not be
|
||||
# entirely appropriate to inherit from for on-device configurations.
|
||||
|
||||
include device/generic/goldfish/arm64-vendor.mk
|
||||
-include device/generic/goldfish/arm64-vendor.mk
|
||||
|
||||
# Copy different zygote settings for vendor.img to select by setting property
|
||||
# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
include device/generic/goldfish/x86-vendor.mk
|
||||
-include device/generic/goldfish/x86-vendor.mk
|
||||
|
||||
# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
# build quite specifically for the emulator, and might not be
|
||||
# entirely appropriate to inherit from for on-device configurations.
|
||||
|
||||
include device/generic/goldfish/x86_64-vendor.mk
|
||||
-include device/generic/goldfish/x86_64-vendor.mk
|
||||
|
||||
# Copy different zygote settings for vendor.img to select by setting property
|
||||
# ro.zygote=zygote64_32 or ro.zygote=zygote32_64:
|
||||
|
|
|
@ -43,7 +43,7 @@ PRODUCT_CHARACTERISTICS := emulator
|
|||
PRODUCT_FULL_TREBLE_OVERRIDE := true
|
||||
|
||||
# goldfish vendor partition configurations
|
||||
$(call inherit-product, device/generic/goldfish/vendor.mk)
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/vendor.mk)
|
||||
|
||||
#watchdog tiggers reboot because location service is not
|
||||
#responding, disble it for now.
|
||||
|
|
Loading…
Reference in New Issue