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

Commit da17a3d5 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Po-Chien Hsueh
Browse files

Fix unbundled branch by not having it pick up goldfish dependency 

Bug: 110165361

Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
Merged-In: I0824b140fdfee296288c03fd03a3bac7966e9179
(cherry picked from commit 16e7004e)
(cherry picked from commit 3aa57d8d)
parent c2effa87

target/product/aosp_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
# - VNDK enforcement

# - compatible property override enabled



include device/generic/goldfish/arm32-vendor.mk

-include device/generic/goldfish/arm32-vendor.mk



include $(SRC_TARGET_DIR)/product/full.mk

target/product/aosp_arm64.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,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
@@ -21,7 +21,7 @@ 
# - VNDK enforcement

# - compatible property override enabled



include device/generic/goldfish/x86-vendor.mk

-include device/generic/goldfish/x86-vendor.mk



include $(SRC_TARGET_DIR)/product/full_x86.mk

target/product/aosp_x86_64.mk

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