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

Commit 135a5bab authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Fix unbundled branch by not having it pick up goldfish dependency Bug: 110165361 

am: 16e7004e

Change-Id: I10e70847d78294e1c1470c740049e6881b74161b
parents a5d53ecd 16e7004e

target/product/aosp_arm.mk

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

target/product/aosp_arm64.mk

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

target/product/aosp_x86.mk

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

target/product/aosp_x86_64.mk

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

target/product/emulator.mk

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