From: jihye424.kim <jihye424.kim@samsung.com>
Date: Tue, 26 Dec 2017 09:27:29 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_studio_3.0_p5.0
X-Git-Tag: submit/tizen_studio_4.5_p6.5/20220111.085032~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F26%2F165126%2F2;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'tizen' into tizen_studio_3.0_p5.0

Change-Id: I81f8f47088d13a25c0e768fd6c80dd9d569d76bb
---

434a06859c8b199d5ebc5d49904cdbc909e1d4b6
diff --cc package/build.linux
index 3426f01d8f73,012b6a0de467..395eabb81f4f
--- a/package/build.linux
+++ b/package/build.linux
@@@ -27,7 -27,7 +27,7 @@@ build(
  # install
  install()
  {
- 	TIZEN_VERSIONS="4.0"
 -	TIZEN_VERSIONS="5.0 4.0 3.0"
++	TIZEN_VERSIONS="5.0"
  	for VER in ${TIZEN_VERSIONS} ; do
  		KERNEL_DIR=$SRCDIR/package/${VER}-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-${VER}/common/emulator/data/kernel
  		mkdir -p $KERNEL_DIR
diff --cc package/pkginfo.manifest
index 97a176e83ba1,6b203398bb77..905a5b9efd40
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -7,7 -7,22 +7,3 @@@ OS: ubuntu-32, ubuntu-64, windows-32, w
  Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel
  
 -Package: 4.0-emulator-kernel-x86
 -OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -Build-host-os: ubuntu-64
 -Description: Tizen x86 Emulator Kernel
 -
--#Package: 4.0-emulator-kernel-arm
 -#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -#Build-host-os: ubuntu-64
 -#Description: Tizen ARM Emulator Kernel
 -
 -Package: 3.0-emulator-kernel-x86
 -OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
 -Build-host-os: ubuntu-64
 -Description: Tizen x86 Emulator Kernel
 -
 -#Package: 3.0-emulator-kernel-arm
--#OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
--#Build-host-os: ubuntu-64
--#Description: Tizen ARM Emulator Kernel