Commit Graph

20 Commits

Author SHA1 Message Date
Roman Kiryanov
cc09ceecde Switch to the kernel from kernel/prebuilts
prebuilts/qemu-kernel is deprecated.

Bug: 170677468
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
Merged-In: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
2021-02-04 14:20:28 -08:00
Roman Kiryanov
f396f3e1d4 Switch emulator to 5.10 kernel (GKI 2.0)
Bug: 175707513
Bug: 170560077
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I1470ca760cc453e2a87bd316b46c86270a2928b4
Merged-In: I1470ca760cc453e2a87bd316b46c86270a2928b4
2020-12-21 16:49:09 -08:00
Roman Kiryanov
cc527e2899 emulator: switch x86* to 5.4 kernel
Bug: 147493341
Test: boot
Change-Id: Iad0ce71c34cc55c858b24598120bf01d91e10aa1
Signed-off-by: Roman Kiryanov <rkir@google.com>
2020-02-20 18:19:00 -08:00
Weilun Du
c1084c0534 [Advanced Features] Change the source location of advancedFeatures.ini
Copy advancedFeatures.ini file from
device/generic/goldfish/data/etc, which is the centralized place for
advancedFeatures.ini.

BUG: 135187406

Change-Id: Ib1d2ec2f91d66dde89bc4a884cd99dbb1a2c83cb
Signed-off-by: Weilun Du <wdu@google.com>
2019-06-13 09:57:42 -07:00
bohu
5abed79791 emulator: uses 4.14 for x86[_64]
BUG: 129274443
Change-Id: Ia24a85203c39cf829ae96fda1f0ccc41b104816f
2019-04-15 15:27:44 -07:00
bohu
e1593add45 emulator: uses 4.9 kernel
BUG: 78272519
this cl does not impact real devices

Change-Id: I2ff221acbb5fad03d374da771337f927bfbfc857
2018-04-20 09:59:13 -07:00
bohu
8be7aa6503 emulator: uses 4.4 kernel for x86 and x86_64
BUG: 72886167
Test: build sdk_phone_x86 and sdk_phone_x86_64
sdk targets successfully

Change-Id: Idb4c2ac10b1858276c27a06af675531d8840577f
2018-02-28 11:42:45 -08:00
bohu
baf611e76b emulator: enable 32bit x86 image to run on 64bit kernel
BUG: 71861550
Change-Id: Iff79fd64afddf9f4c99bf2a069299984b53b3187
2018-01-18 14:13:26 -08:00
bohu
dd54be956c sdk: copy encryptionkey.img to x86{_64} image zip
BUG: 64715896

Change-Id: I8471c50875547cd0b3071749cb56bceb83ef726b
Merged-In: I8471c50875547cd0b3071749cb56bceb83ef726b
2017-08-15 11:01:09 -07:00
bohu
06855f4f5e sdk: use 3.18 kernel
BUG: 64715817

Change-Id: Ie889c3aa111e6e4a140a745a71f02bbe65d5ec13
Merged-In: Ie889c3aa111e6e4a140a745a71f02bbe65d5ec13
2017-08-15 11:00:49 -07:00
bohu
50dc27b2ca Revert "Emulator: update development to 2362bfb6"
It breaks build of docs because SdkSetup has dependency
on gsf-client

This reverts commit 5c26bfa4bc.
2017-06-23 14:19:05 -07:00
bohu
5c26bfa4bc Emulator: update development to 2362bfb6
Bug: 37302997

oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com>
Date:   Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip

Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
2017-06-15 18:13:02 +00:00
Yahan Zhou
9fd4870d14 Feature control config file in system image
This CL adds feature control config file to the system image bundle.

It works with this emulator CL:

https://android-review.googlesource.com/#/c/233279/

Change-Id: I1e0f73f0dc36853d99c2408679aa6706b6489a58
(cherry picked from commit 280091d47054677b358216c8fa0cac106d42a520)
2016-05-27 01:52:24 +00:00
bohu
e73ff42040 kernel-ranchu: add ranchu kernel for sdk builds
For x86 and x86_64, sdk images will include kernel-ranchu that will
boot ranchu devices by qemu2 emulator; kernel-qemu will still be kept
to boot goldfish devices by classic emulator.

Change-Id: Ie2ada109cade730d03e709168802db826442b8d8
(cherry picked from commit eefafd91041967c0c08cb12e7dfbbcf670257d55)
(cherry picked from commit aacab1d961baaf1d1278a64b248361b21ddd2df0)
2016-01-23 01:46:02 +00:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-27 16:10:14 -07:00
Jean-Baptiste Queru
07ffdd5c31 Reference kernels in new location
Change-Id: Ic2eae2fef0900e8a8f74cff00e427b99c970f036
2012-01-09 10:57:13 -08:00
Raphael
d79eab5a39 SDK: source.properties templates.
This adds support for "templates" source.properties files that can
inherit the platform version/codename/api level from the build.

The purpose is for a given build to always generate SDK files that
match the platform generated in the same branch.

Change-Id: Id623bbef45a04d953da8eade7e8c34c77709f9c3
2011-11-15 16:56:17 -08:00
Xavier Ducrohet
7fb4cc5359 Build SDK with the new location for the system image.
Change-Id: I7e3e176d82e444989cd5501c009ea767e1446199
2011-09-21 15:30:00 -07:00
David 'Digit' Turner
f7f6842b32 sdk: Copy ABI-specific kernel image to platform image directory.
This patch depends on https://review.source.android.com/24052

It is used to ensure that the proper kernel image is copied to the
platform image's kernel-qemu.

This is needed because for ARMv7 platform builds, the image is
in prebuilt/android-arm/kernel/kernel-qemu-armv7, instead of
   prebuilt/android-arm/kernel/kernel-qemu

Change-Id: I0f175a1ba3d97f5c7420597bdeebc7a353551194
2011-06-29 11:32:17 +02:00