From: Jinhyung Jo Date: Fri, 1 Sep 2017 10:25:40 +0000 (+0900) Subject: Merge branch 'tizen' into tizen_studio_2.0_p2.4 X-Git-Tag: TizenStudio_2.0_p2.4~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F147202%2F1;p=sdk%2Femulator%2Fqemu.git Merge branch 'tizen' into tizen_studio_2.0_p2.4 Change-Id: I60956d675644a2557e224b36550060635d2b462e Signed-off-by: Jinhyung Jo --- 181274a70948beacdff0fad8b2611822c96961cb diff --cc package/pkginfo.manifest index 44c6a1901b,34bc5db221..6dae6e71c4 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@@ -59,62 -176,61 +59,3 @@@ Build-dependency: 2.4-emulator-lib-dev Install-dependency: cocoasudo [ macos-64 ], 2.4-emulator-kernel-x86 [ macos-64 ], 2.4-libav [ macos-64 ], tuntaposx [ macos-64 ] Description: Tizen x86 Emulator - Package: mobile-2.4-emulator-qemu-skins -# For tizen 2.3.2 -Package: 2.3.2-emulator-qemu-common --OS: ubuntu-32 --Build-host-os: ubuntu-32 - Description: Skin images for Mobile 2.4 Tizen Emulator -Description: Common binaries for Tizen Emulator -- - Package: mobile-2.4-emulator-qemu-skins -Package: 2.3.2-emulator-qemu-common --OS: ubuntu-64 --Build-host-os: ubuntu-64 - Description: Skin images for Mobile 2.4 Tizen Emulator -Description: Common binaries for Tizen Emulator -- - Package: mobile-2.4-emulator-qemu-skins -Package: 2.3.2-emulator-qemu-common --OS: windows-32, windows-64 --Build-host-os: ubuntu-64 - Description: Skin images for Mobile 2.4 Tizen Emulator -Description: Common binaries for Tizen Emulator -- - Package: mobile-2.4-emulator-qemu-skins -Package: 2.3.2-emulator-qemu-common --OS: macos-64 --Build-host-os: macos-64 - Description: Skin images for Mobile 2.4 Tizen Emulator -Description: Common binaries for Tizen Emulator -- - Package: wearable-2.4-emulator-qemu-skins -Package: 2.3.2-emulator-qemu-x86 --OS: ubuntu-32 --Build-host-os: ubuntu-32 - Description: Skin images for Wearable 2.4 Tizen Emulator -Build-dependency: 4.0-emulator-lib-dev [ ubuntu-32 ], 4.0-libav-dev [ ubuntu-32 ] -Install-dependency: 2.3.2-emulator-kernel-x86 [ ubuntu-32 ], 2.3.2-libav [ ubuntu-32 ] -C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6 -Description: Tizen x86 Emulator -- - Package: wearable-2.4-emulator-qemu-skins -Package: 2.3.2-emulator-qemu-x86 --OS: ubuntu-64 - Build-host-os: ubuntu-64 - Description: Skin images for Wearable 2.4 Tizen Emulator - - Package: wearable-2.4-emulator-qemu-skins - OS: windows-32, windows-64 --Build-host-os: ubuntu-64 - Description: Skin images for Wearable 2.4 Tizen Emulator - - Package: wearable-2.4-emulator-qemu-skins - OS: macos-64 - Build-host-os: macos-64 - Description: Skin images for Wearable 2.4 Tizen Emulator - - Package: tv-2.4-emulator-qemu-skins - OS: ubuntu-32 - Build-host-os: ubuntu-32 - Description: Skin images for TV 2.4 Tizen Emulator -Build-dependency: 4.0-emulator-lib-dev [ ubuntu-64 ], 4.0-libav-dev [ ubuntu-64] -Install-dependency: 2.3.2-emulator-kernel-x86 [ ubuntu-64 ], 2.3.2-libav [ ubuntu-64 ] -C-Prerequisites: acl, bridge-utils, openvpn, libfontconfig1, libglib2.0-0, libjpeg-turbo8, libpixman-1-0, libpng12-0, libsdl1.2debian, libsm6, libv4l-0, libx11-xcb1, libxcb-icccm4, libxcb-image0, libxcb-randr0, libxcb-render-util0, libxcb-shape0, libxcb-xfixes0, libxi6 -Description: Tizen x86 Emulator -- - Package: tv-2.4-emulator-qemu-skins - OS: ubuntu-64 -Package: 2.3.2-emulator-qemu-x86 -OS: windows-32 --Build-host-os: ubuntu-64 - Description: Skin images for TV 2.4 Tizen Emulator -Build-dependency: 4.0-emulator-lib-dev [ windows-32 ], 4.0-libav-dev [ windows-32 ] -Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav -Description: Tizen x86 Emulator -- - Package: tv-2.4-emulator-qemu-skins - OS: windows-32, windows-64 -Package: 2.3.2-emulator-qemu-x86 -OS: windows-64 --Build-host-os: ubuntu-64 - Description: Skin images for TV 2.4 Tizen Emulator -Build-dependency: 4.0-emulator-lib-dev [ windows-64 ], 4.0-libav-dev [ windows-64 ] -Install-dependency: 2.3.2-emulator-kernel-x86, 2.3.2-libav -Description: Tizen x86 Emulator -- - Package: tv-2.4-emulator-qemu-skins -Package: 2.3.2-emulator-qemu-x86 --OS: macos-64 --Build-host-os: macos-64 - Description: Skin images for TV 2.4 Tizen Emulator -Build-dependency: 4.0-emulator-lib-dev [ macos-64 ], 4.0-libav-dev [ macos-64 ] -Install-dependency: cocoasudo [ macos-64 ], 2.3.2-emulator-kernel-x86 [ macos-64 ], 2.3.2-libav [ macos-64 ], tuntaposx [ macos-64 ] -Description: Tizen x86 Emulator -