Commit graph

342 commits

Author SHA1 Message Date
Hung-ying Tyan
1785816ca1 Enable vbmeta_system for GSI targets
in order to mix GSI onto android10 Cuttlefish.

Bug: 158302764
Test: mixing GSI onto android10 Cuttlefish
Change-Id: I77385495583034324f5e29bed27c588dc98215e2
2020-07-14 16:04:20 +00:00
Yo Chiang
dcfa601374 Remove default GSI libnfc-nci.conf
libnfc-nci.so provides a default config at /system/etc/libnfc-nci.conf.
Remove /system/etc/libnfc-nci.conf PRODUCT_COPY_FILES entries from
aosp_product.mk and board/generic/device.mk.

Bug: 157704723
Test: Build gsi. /system/etc/libnfc-nci.conf is installed.
Test: Flash gsi. Check logcat and NFC still works.
Test: Toggle NFC on/off and /etc/libnfc-nci.conf is loaded.
Test: Build aosp_bonito. Both /(system|product)/etc/libnfc-nci.conf are
  installed.
Test: Flash aosp_bonito. Check logcat and NFC still works.
Test: Toggle NFC on/off and /product/etc/libnfc-nci.conf is loaded.
Change-Id: Id119a88a10b549e1fd475cf9b14b18410923011b
2020-06-08 11:56:10 +00:00
Roman Kiryanov
6e0c857fe2 Import the d/g/goldfish soong namespace for libwifi-hal-emu
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
2020-05-18 09:46:25 -07:00
Bowgo Tsai
06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
bohu
9492ee3d1b emulator: support dynamic partitions
BUG: 125540538

Change-Id: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
Merged-In: I9d486f57ac4ec11b1bbe9ab97890d12441c3054e
2019-05-05 20:34:02 -07:00
Dan Willemsen
53d62fed72 Bump the remaining 32-bit arm configs to require neon
Stop using armv7-a without neon for 32-bit unbundled apps, and update
generic_x86_arm to match the cuttlefish configuration that includes
neon.

Test: treehugger
Change-Id: Ieb6a2106655803a8ca609907c12168e628ee1b85
2019-01-23 22:27:33 -08:00
Elliott Hughes
27932bf3a8 Use NEON for CTS and SDK builds too.
It's 2019 and the CDD has required NEON for many years now.

I've left unbundled apps alone for now.

Test: treehugger
Change-Id: Iee22d4605a81e2840063a203b76db7df5b4f3c37
2019-01-09 20:15:30 +00:00
TreeHugger Robot
cccca824ef Merge "Enable dyanmic image size for GSI" into stage-dr1-aosp-master 2018-08-06 18:41:42 +00:00
SzuWei Lin
aadbd3084c Enable dyanmic image size for GSI
The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.

Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
2018-08-03 06:57:19 +00:00
Kevin Rocard
f36085bff9 Add emulator audio policy config in /vendor not /system
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.

As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.

Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.

Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.

Bug: 78543061
Bug: 111963599
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
          frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126)
2018-08-01 04:22:50 +00:00
SzuWei Lin
db3d1712f5 resolve merge conflicts of 2927f2185c to stage-dr1-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I7812dcb06172fd0ca5caf38ad8ee616cf1936f43
2018-07-23 16:28:14 +08:00
SzuWei Lin
2927f2185c Merge "Move some BoardConfig settings from EmuCommon to GsiCommon"
am: bcc4081cd1

Change-Id: I456dde1025f2e61c3c9c463c38279aa0404d91ac
2018-07-23 00:35:49 -07:00
SzuWei Lin
e592c965ee Move some BoardConfig settings from EmuCommon to GsiCommon
Move the settings which effect the system image to the file
BoardConfigGsiCommon.mk

Bug: 80117040
Test: build aosp_arm64-userdebug and pass
Change-Id: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
Merged-In: I42b14a124992c21b2da0e9e6197b1c38c6e58ce3
2018-07-18 10:19:46 +00:00
Isaac Chen
55e1d01f92 Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
Merged-In: I5392e0e88865d4908906a67c29939c23af84baf0
(cherry picked from commit 510b76d8ff)
2018-07-05 18:47:15 +08:00
Isaac Chen
7f2eb04bb6 Merge "Refactor BoardConfig.mk for emulator products" into stage-aosp-master
am: c9ff0edb20

Change-Id: I316f9712786b283918a9a938e78e50c181ab6e9e
2018-07-04 10:40:45 -07:00
Isaac Chen
510b76d8ff Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
2018-07-03 09:58:59 +00:00
Bowgo Tsai
631900e6ce Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
Merged-In: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-06-29 14:23:25 +01:00
Anton Hansson
91c4688045 Merge "Add some experimental mainline targets." into stage-aosp-master
am: c74d03ed18

Change-Id: Ic85dbb05e5e1c23d689487fc34f6eef51f01cb10
2018-06-29 03:09:58 -07:00
Anton Hansson
c0c39cf270 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm64 && m nothing && lunch mainline_system_arm64 && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
Merged-In: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:28:24 +01:00
Anton Hansson
cf27a3da33 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm64: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm64: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm && m nothing && lunch mainline_system_arm && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:27:08 +01:00
Treehugger Robot
7f0ac95d21 Merge "Set proper CPU variant for aosp_arm" 2018-06-15 20:19:10 +00:00
Isaac Chen
e44b0d96b9 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
Merged-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
(cherry picked from commit b2e58893c3)
2018-06-15 18:40:42 +00:00
bohu
a89ee59b13 emualtor: cleanup media configuration
am: d7dd3e2d3d

Change-Id: I86c7507d4c850f1d03710b03f5a52aa50fe1d6df
2018-06-13 16:01:39 -07:00
Bo Hu
82de42067e Merge "emulator: move sepolicy to goldfish project" 2018-06-13 22:14:32 +00:00
bohu
d7dd3e2d3d emualtor: cleanup media configuration
The media configuration is handled by goldfish/vendor.mk
already; clean them up from device.mk files.

this cl does not impact arm devices;
and it does the right thing for x86/64 devices
because the media configuration should go to vendor
instead of staying on system

BUG: 110030159
Change-Id: If492f1e01f600b1c969e9ef04598f7af6783970e
2018-06-13 22:10:51 +00:00
bohu
4abeb75f32 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 12:45:47 -07:00
bohu
4001858313 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 18:37:16 +00:00
Treehugger Robot
59c5127bea Merge "Create system.prop for GSI Pi" 2018-06-13 17:48:06 +00:00
Bjoern Johansson
2bfb5627ea Merge "Support new hostapd build target without HIDL"
am: acbfc3fb94

Change-Id: I13bc909b0ba2204703ccc166ae17624efe8ab3d5
2018-06-12 17:12:15 -07:00
Bjoern Johansson
a2d754ce3a Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases

(cherry picked from commit a53c522678)

Change-Id: I8fa4908d1bef8ff25573abb72bbac433ae3151de
2018-06-12 11:39:00 -07:00
SzuWei Lin
326ad779c1 Create system.prop for GSI Pi
Properties for GSI Pi are not exactly the same as those for legacy GSI.
Create a new gsi_system.prop for GSI Pi to avoid reusing legacy
treble_system.prop used by legacy GSI (aosp_$arch_a(b) products).

Bug: 78605339
Test: build and observe the system/build.prop
Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3
Merged-In: I435e33558e244009af9a91a97580fd56591ff6f3
(cherry picked from commit 3fc49fede8)
2018-06-12 18:03:31 +08:00
Bjoern Johansson
a53c522678 Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases
Change-Id: I6a654ac2dea20af048ac731876ac603773fcf3d8
2018-06-11 15:56:51 -07:00
bohu
3a83195522 emulator: update aosp sepolicies
There have been quite some changes that should go to aosp.
This CL squash all of them into a single one.

Change-Id: I1e8d172b99cc98c93f2925fef32da8b461c277ed
Merged-In: I93b8489f710d194917d4b482ebca960c39658fd9
Merged-In: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-11 15:56:25 -07:00
Bo Hu
23508266a8 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev
am: 8e2f247ca1

Change-Id: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-07 21:05:49 -07:00
bohu
7cdfd674d5 emulator: allows vendor_init to set qemu_props
BUG: 109872686

this cl only impacts emulator images

Change-Id: I93b8489f710d194917d4b482ebca960c39658fd9
2018-06-07 09:19:19 -07:00
Treehugger Robot
f1a5557164 Merge "Temporarily whitelisting system domains writing vendor props" 2018-06-06 03:54:11 +00:00
Isaac Chen
6393783898 Merge "Set proper CPU variant for aosp_arm" into pi-dev
am: b2a5515585

Change-Id: I6f38dd1fbec1192d09cbe434650a8b4292c30315
2018-06-05 11:44:52 -07:00
TreeHugger Robot
b2a5515585 Merge "Set proper CPU variant for aosp_arm" into pi-dev 2018-06-05 18:34:41 +00:00
Jeff Vander Stoep
72464c2c66 Merge "sepolicy: update OWNERS" am: 99a215f3db
am: d0be836bbb

Change-Id: I8dec02ad756ca70fbd059f796d4ffb98515c6cb2
2018-06-05 07:58:06 -07:00
Jeff Vander Stoep
8d235ecb49 sepolicy: update OWNERS
Test: n/a
Change-Id: I905b099c66e44468ca342bcbfe3dcb4dd44071a9
2018-06-04 22:10:54 -07:00
huans
c3710cbd95 Merge "Clean up deprecated properties. Set sepolicy for vendor process" into pi-dev
am: cd42897025

Change-Id: Icfb2831128ea7777efc1216e30157f43631e16b6
2018-06-04 14:29:44 -07:00
huans
360eb865ed Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736
Test: Manually
Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
2018-06-04 11:02:12 -07:00
Bo Hu
deec5c304c Merge changes from topic "emulator-gsi-configs" into pi-dev
am: 63762bdf41

Change-Id: Ia25fa1eeebb37e43ddf360f56f0c77c87c1892f0
2018-06-04 10:23:04 -07:00
Bo Hu
63762bdf41 Merge changes from topic "emulator-gsi-configs" into pi-dev
* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
2018-06-04 16:29:36 +00:00
Isaac Chen
b2e58893c3 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
2018-05-31 10:01:08 +08:00
huans
3d31afe594 emulator: add missing apns config
We add goldfish specific apns config files to /data/misc/apns/etc/
for aosp_* targets to have working telephony and wifi.

BUG: 79584197
Change-Id: I46591d923496420212cd279c0b90f0b4eb11cea4
2018-05-30 14:48:25 -07:00
SzuWei Lin
494d2fe97b Enable metadata in GSI
am: 5d356e2397

Change-Id: I2086d56e42b2318a8080d16f13d48c9ee4a23bf1
2018-05-30 11:05:42 -07:00
SzuWei Lin
5d356e2397 Enable metadata in GSI
Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
2018-05-30 17:01:49 +08:00
Jiyong Park
6b79c9b769 Temporarily whitelisting system domains writing vendor props
system properties must not be used as a communication channel in between
system and vendor processes. However, there has been no enforcement on
this: system process could write system properties that are owned and
read by vendor processes and vice versa. Such communication should be
done over hwbinder and should be formally specified in HIDL.

Until we finish migrating the existing use cases of sysprops to HIDL,
whitelisting them in system_writes_vendor_properties_violators so that
the violators are clearly tracked.

These violators are allowed only for P, but not for Q.

Bug: 78598545
Test: m -j selinux_policy when choosecombo'ed to aosp_arm64
Merged-In: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
(cherry picked from commit bb1432b61b)
2018-05-24 19:03:25 +09:00
Jiyong Park
77d665b558 Merge "Temporarily whitelisting system domains writing vendor props" into pi-dev
am: 92267a5d02

Change-Id: I641fbbb0e3efecafbbfdb5d523218a6967961eca
2018-05-21 22:10:49 -07:00