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

Commit 4781e30a authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of de949b11 to jb-mr2-dev 

Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
parents c08eceee de949b11

target/product/emulator.mk

+41 −17
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ 


#

# This file is included by other product makefiles to add all the

# emulator-related host modules to PRODUCT_PACKAGES.

# emulator-related modules to PRODUCT_PACKAGES.

#



# Host modules

PRODUCT_PACKAGES += \

    emulator \

    emulator-x86 \
@@ -35,9 +36,32 @@ PRODUCT_PACKAGES += \ 
    lib64GLES_V2_translator \

    lib64EGL_translator



# Device modules

PRODUCT_PACKAGES += \

    egl.cfg \

    gles_emul.cfg \

    libGLESv1_CM_emul \

    libGLESv2_emul \

    libEGL_emul \

    libut_rendercontrol_enc \

    gralloc.goldfish \

    libGLESv1_CM_emulation \

    lib_renderControl_enc \

    libEGL_emulation \

    libGLESv2_enc \

    libOpenglSystemCommon \

    libGLESv2_emulation \

    libGLESv1_enc \

    qemu-props \

    qemud \

    camera.goldfish \

    lights.goldfish \

    gps.goldfish \

    sensors.goldfish





PRODUCT_COPY_FILES += \

    device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \

    device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \

    device/generic/goldfish/init.goldfish.sh:system/etc/init.goldfish.sh \

    device/generic/goldfish/ueventd.goldfish.rc:root/ueventd.goldfish.rc

target/product/vbox_x86.mk

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ endif 
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/vbox_x86/device.mk)



PRODUCT_PACKAGES += \

       camera.vbox_x86 \

       lights.vbox_x86 \

       gps.vbox_x86 \

       sensors.vbox_x86



PRODUCT_NAME := vbox_x86

PRODUCT_DEVICE := vbox_x86

PRODUCT_MODEL := Full Android on x86 VirtualBox