Commit Graph

1056 Commits

Author SHA1 Message Date
SzuWei Lin fa420b40c5 Add USE_XML_AUDIO_POLICY_CONF to GSI
USE_XML_AUDIO_POLICY_CONF is must for Treble device, so it is
also must on GSI. The settings is missed when creating GSI
aosp_$arch, add it back by this patch.

Bug: 110988359
Bug: 111053290
Test: build aosp_arm64 and build pass
Change-Id: I95f096e58350233fdcc8de115cc1691360070445
2018-07-06 13:22:35 +08: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 116c46928d Merge "Refactor BoardConfig.mk for emulator products" into stage-aosp-master am: c9ff0edb20
am: 7f2eb04bb6

Change-Id: I2a2b98ce6db55c89cc2193842f8b7dc72a1b602f
2018-07-04 10:44:44 -07: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 6ad2c2b3a8 Merge "Add some experimental mainline targets." into stage-aosp-master am: c74d03ed18
am: 91c4688045

Change-Id: Iceeaa7bbcb7ac82ad840d3122e484caf5aaac5b4
2018-06-29 03:13:56 -07: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
Mathieu Chartier f39c2c7495 Move go default system properties into prop files
Test: manual
Bug: 110517986

(cherry-picked from commit 732a4cc62f)

Merged-In: I28f5c18bb9e70c755ece50c49c02434f825878dc
Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 15:12:46 -07:00
Mathieu Chartier 732a4cc62f Move go default system properties into prop files
Test: manual
Bug: 110517986

Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 18:26:21 +00:00
TreeHugger Robot d8f86ae1fe Merge "Add emulator audio policy config in /vendor not /system" 2018-06-21 18:08:50 +00:00
Dan Willemsen 9bc1da527f Merge "aosp_x86_arm builds have overriding commands" am: 6ae08c1416
am: 93e1a187c7

Change-Id: I5448aa14a1f0d104bebbeb269c1999fe971ece9a
2018-06-20 10:07:11 -07:00
Dan Willemsen 93e1a187c7 Merge "aosp_x86_arm builds have overriding commands"
am: 6ae08c1416

Change-Id: Ie3cf105dfa9fca4c2e26e2a5e96b992a1be343b6
2018-06-20 10:03:54 -07:00
Dan Willemsen 5250840358 aosp_x86_arm builds have overriding commands
This product has warnings about overriding build commands, which means
that there are multiple instructions on how to build a file, and we've
just picked one of them. Which one we pick is usually stable, but it can
change.

Bug: 77611511
Test: turn default to false, aosp_x86_arm still uses a warning
Change-Id: Id821c04e3dd6a1f69ea748827c3570a751b4e1dd
2018-06-19 23:25:16 -07:00
Kevin Rocard dad3ad6126 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
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
Signed-off-by: Kevin Rocard <krocard@google.com>
2018-06-19 17:48:10 -07:00
Weilun Du dfe622a1ef Merge "Increase system image size to 2.5 GB" into pi-dev
am: bd141d36a0

Change-Id: I28c9f05314f7ce00969c45a03863f52a8d68b3a4
2018-06-18 16:23:59 -07:00
Weilun Du 31b2f7e57f Increase system image size to 2.5 GB
Fixed build breakge caused by insufficient image size.
BUG: 110198136

Change-Id: I12a4a43b522b7867ff789854cf5b76d13f2f5499
Signed-off-by: Weilun Du <wdu@google.com>
2018-06-17 15:37:53 -07: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
Android Build Merger (Role) f249ced167 [automerger] emualtor: cleanup media configuration am: d7dd3e2d3d am: 4cf7715bab
Change-Id: If6fae38c988be3d60602f3b2f22133b638734e37
2018-06-13 22:58:08 +00:00
TreeHugger Robot e64b309d22 Merge "emulator: move sepolicy to goldfish project" into pi-dev 2018-06-13 22:19:14 +00: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 0d749a7a3e emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

this cl does not impact real devices, as the selinux
rules are for emulator only

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 22:09:24 +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
bohu 780692fe61 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
2018-06-13 11:30:30 -07: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
TreeHugger Robot 92267a5d02 Merge "Temporarily whitelisting system domains writing vendor props" into pi-dev 2018-05-22 05:04:40 +00:00
Paul Crowley 00f88c2c1b Merge "Revert "Add metadata/ to aosp_arm64 temporarily"" into pi-dev
am: b1e6c48b26

Change-Id: Id2773f063671e4ebb339657c2184dfb3fae546e8
2018-05-21 13:47:57 -07:00
Paul Crowley 66bad03f08 Revert "Add metadata/ to aosp_arm64 temporarily"
This reverts commit eee6e39145.
Bug: 79781913
Test: Compile for this target.

Change-Id: Ia635c124557ccad6cfef1a8867ca099de6b3f3db
2018-05-21 11:57:16 -07:00
Jiyong Park bb1432b61b 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
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
2018-05-18 20:16:51 +09:00
SzuWei Lin 4ae7e2bba0 Merge "Add metadata/ to aosp_arm64 temporarily" into pi-dev
am: 8b6eda5f49

Change-Id: Ia8f29e6aaa0e36c4f3305904a06fd65f9ad28b06
2018-05-16 11:50:42 -07:00
TreeHugger Robot 8b6eda5f49 Merge "Add metadata/ to aosp_arm64 temporarily" into pi-dev 2018-05-16 18:43:02 +00:00
SzuWei Lin eee6e39145 Add metadata/ to aosp_arm64 temporarily
FBE needs metadata/ under root folder. Adds metadata to
root folder before it has a final solution.

Bug: 79572884
Test: Boot on some pixel devices + aosp_arm64-userdebug with the patch
Change-Id: I5ef5763b755615dad4c8c711f9c9ef8987d3bb68
2018-05-16 18:32:48 +00:00
Isaac Chen e28dc89ca8 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev
am: 8f222b9e15

Change-Id: Id145117b535cc7a304b6c91897770d550a4e97ac
2018-05-14 21:16:52 -07:00
Isaac Chen 8f222b9e15 Merge "Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch" into pi-dev 2018-05-15 04:09:36 +00:00
Bowgo Tsai 4f2b09be68 Merge "Enable /cache mount point" into pi-dev
am: 115aae0f93

Change-Id: I0e89f53b8fe5a932de7641646d5b034358e1bdd0
2018-05-10 19:20:54 -07:00
Bowgo Tsai 4e9ff91935 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
2018-05-10 15:20:49 +08:00
Isaac Chen 075ee920fb Enable PRODUCT_COMPATIBLE_PROPERTY for aosp_$arch
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.

Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
    and found "ro.actionable_compatible_property.enabled=true".
    aosp_x86(_64) could boot to home screen.

Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
2018-05-10 13:13:21 +08:00
Isaac Chen 64dec58cc2 Merge "Build disabled vbmeta.img for aosp_$arch" into pi-dev
am: 0d35d1a425

Change-Id: I9d0865299c34dd6997d08bb1a297ca6acda9ef8b
2018-05-09 00:00:47 -07:00
Isaac Chen e63c937bc3 Build disabled vbmeta.img for aosp_$arch
System images of aosp_$arch are used as GSIs in P, and traditional GSI
users often need a special vbmeta image to disable verity (if AVB is
employed) befrre they flash the GSI.

"BOARD_BUILD_DISABLED_VBMETAIMAGE := true" builds such vbmeta.img

Bug: 79393905
Test: # For arch in arm, arm64, x86, x86_64, do
    $ lunch aosp_$arch; m -j # found vbmeta.img under $OUT

Change-Id: I113006385991a2daab60d3c55dc03f23f1b383b8
2018-05-08 18:10:06 +08:00
android-build-team Robot c92b6796ce Merge "Disable privapp_permissions checking in GSI temporarily" into pi-dev
am: 76354382d1

Change-Id: Ib2e1f092721c486b4660487e1302a7d9012525c0
2018-05-03 16:17:08 -07:00
SzuWei Lin c71d9863c6 Disable privapp_permissions checking in GSI temporarily
Some vendor apps are using shared UID without white-listing the apps.
A runtime checking with these apps causes some devcies cannot boot
with GSI. We disable the checking before bug b/78105955 solved.

Bug: 79174430
Bug: 78105955
Test: Boot pixel devices with GSI applied the patch.
Change-Id: Ic25f5e2c4506b79564959adf57839a7ddc4330c2
2018-05-03 13:34:26 +08:00
android-build-team Robot 70299e3414 Merge "Create system.prop for GSI Pi" into pi-dev
am: 5646b804de

Change-Id: Ie9f26ef4e76905d8cf77de97242a39cef22cf082
2018-04-30 14:14:55 -07:00
SzuWei Lin 3fc49fede8 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
2018-04-26 08:55:43 +00:00
Isaac Chen 50958e2cae Merge "Enable VNDK for aosp_arm(64)" 2018-04-24 18:10:44 +00:00
Treehugger Robot a0f595ec69 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" 2018-04-24 13:35:01 +00:00
Isaac Chen 5327e98b1a Enable VNDK for aosp_arm(64)
This is needed for the system images of aosp_arm(64) products to
be used as their respective GSIs in P, and for also aosp_arm(64)
products to boot with the current GSIs.

Bug: 78255604
Test: Built and booted the following products to home screen
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator
    # The system image, both userdebug and user builds, of
    # aosp_arm64 could also boot to home screen and browse
    # the network on a physical device.

Change-Id: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
Merged-In: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
(cherry picked from commit f71547079a)
2018-04-24 19:12:11 +08:00
Isaac Chen 9cbaac5cb7 Merge "Enable VNDK for aosp_arm(64)" into pi-dev
am: 04e361a795

Change-Id: I2aedb55e7bbd112bb31da74bba4809b2f33f0515
2018-04-23 22:05:05 -07:00
Treehugger Robot 3527ff9b84 Merge "Make aosp_$arch system images closer to GSIs" 2018-04-24 02:19:23 +00:00
Isaac Chen 50e6251baa ARM emulator: aosp_arm on 64-bit binder and kernel
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3576770 for x86.

Bug: 71861550
Test: the following products can boot to home screen successfully:
    lunch aosp_arm-userdebug; m -j; emulator
    lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d
Merged-In: Ibe1f53a5798342555e2e84395a13b48d461f483d
(cherry picked from commit 6f114c0110c466d2a117f3e531f9ea5170a121ee)
2018-04-24 10:10:50 +08:00
Isaac Chen 0c97f084c7 Make aosp_$arch system images closer to GSIs
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
Merged-In: I225a13dd74b3e748cc5d1705e1a453348b01d43f
(cherry picked from commit 164eed2e7d)
2018-04-24 10:03:14 +08:00
Isaac Chen f71547079a Enable VNDK for aosp_arm(64)
This is needed for the system images of aosp_arm(64) products to
be used as their respective GSIs in P, and for also aosp_arm(64)
products to boot with the current GSIs.

Bug: 78255604
Test: Built and booted the following products to home screen
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator
    # The system image, both userdebug and user builds, of
    # aosp_arm64 could also boot to home screen and browse
    # the network on a physical device.

Change-Id: I83b79fd4d4e6e522ee78c720fb8c5f6f67ee411b
2018-04-23 19:19:29 +08:00
Elliott Hughes 90f18c4a5d Merge "Remove obsolete (and broken) targets." am: 388f1458a5
am: 2f5404be70

Change-Id: I217a7ff3636c8a2b3ea1113240dc686fb5ecff5a
2018-04-21 11:06:59 -07:00
Pirama Arumuga Nainar 5a1598938f Remove obsolete (and broken) targets.
Bug: N/A
Test: N/A
Change-Id: I461e1adae9c0fec026f05cb890af2c4d8bd71e58
2018-04-20 15:18:22 -07:00
Isaac Chen 97a1b157d9 Merge "Make aosp_$arch system images closer to GSIs" into pi-dev
am: 81a492c7e8

Change-Id: I07870685ece000f4da2231f12095dbf0ae32ac95
2018-04-18 17:56:00 -07:00
Isaac Chen 164eed2e7d Make aosp_$arch system images closer to GSIs
This change modifies aosp_$arch product makefiles so their
system images can be closer to their respective GSIs.

The added contents in this CL are based on treble_common*.mk.
Contents specific to GSI are in aosp_$arch.mk.
Contents common to all devices are moved to full_base.mk.
Contents related to specific device are moved to device.mk.

BoardConfig related makefiles will be changed in another CL.

Bug: 70772101
Test: The following products can boot to home screen:
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator
    $ lunch aosp_arm-userdebug; m -j; emulator
    $ lunch aosp_arm64-userdebug; m -j; emulator

Change-Id: I225a13dd74b3e748cc5d1705e1a453348b01d43f
2018-04-18 18:28:41 +08:00
Isaac Chen 3137955323 Merge "ARM emulator: aosp_arm on 64-bit binder and kernel" into pi-dev
am: 6bb69c4c3d

Change-Id: I492a34654f88a2191f23160722461b9cd85af4b0
2018-04-16 22:28:51 -07:00
Isaac Chen dfa8e7796b ARM emulator: aosp_arm on 64-bit binder and kernel
Starting in P, all 32-bit and 64-bit architectures use 64-bit
binder interface. This is similar to ag/3576770 for x86.

Bug: 71861550
Test: the following products can boot to home screen successfully:
    lunch aosp_arm-userdebug; m -j; emulator
    lunch sdk_phone_armv7-userdebug; m -j; emulator
Change-Id: Ibe1f53a5798342555e2e84395a13b48d461f483d
2018-04-12 16:06:26 +08:00
Dan Willemsen c7ecbfe34d Merge "Revert "Remove flags to turn overriding commands into errors"" am: 5c19615b55
am: 36850e37c9

Change-Id: Ic762fafaae579bd50960584878a4408ef1c47247
2018-04-06 17:21:02 -07:00
Dan Willemsen 07a7227776 Revert "Remove flags to turn overriding commands into errors"
This reverts commit 1d8e86139c.

Reason for revert: fixed art + mac bug

Change-Id: I53a4d490ef32270aaaa8051f5c44958d0bec6469
Test: on mac: m nothing
2018-04-06 21:00:17 +00:00
Dan Willemsen 19f96c9297 Merge "Remove flags to turn overriding commands into errors" am: dc348501f0
am: 9ea760ecd2

Change-Id: I155f5d5d4993fc12e11f5f7940905758c0be22f7
2018-04-06 11:46:32 -07:00
Dan Willemsen 1d8e86139c Remove flags to turn overriding commands into errors
This is a partial revert of I43b645658f468c23a5b9ebcfcd9d4516537db540

On at least a generic_x86 build internally:

art/build/Android.gtest.mk:121: error: overriding commands for target `Uncompressed', previously defined at art/build/Android.gtest.mk:101

Bug: 77611511
Test: none
Change-Id: I78ca65e6f0c81f09e7da848eda797b3a8f97a521
2018-04-06 10:50:45 -07:00
Dan Willemsen d9a2594d1f Merge "Allow boards to turn overriding commands into an error" am: 3c93dbfa61
am: 1533d14754

Change-Id: I032fbc08fc17fb4c4f5d7f4e1f2ace0560407276
2018-04-06 09:12:29 -07:00
Dan Willemsen ac406f5c68 Allow boards to turn overriding commands into an error
Many boards have warnings like this, saying that we defined a build
rule, but later something else came in and overrode it with something
else:

art/build/Android.gtest.mk:677: warning: overriding commands for target `test-art-target-gtest-cmdline_parser_test'
art/build/Android.gtest.mk:674: warning: ignoring old commands for target `test-art-target-gtest-cmdline_parser_test'

Beyond the obvious problem of replacing the rule with something else,
target-specific variables can be combined as well, leading to some very
strange problems.

Since so many boards still have problems like this, but we don't
currently have any global problems, add a flag so that we can mark
boards as not broken. This should prevent regressions while we clean up
the individual problems.

Once the non-broken devices number significantly more than the broken
devices, we'll switch this default. And once they're all cleaned up this
variable will become obsolete, and these warnings will always be errors.

Bug: 77611511
Test: lunch aosp_arm-eng; m nothing
Test: lunch aosp_marlin-eng; m nothing
Test: build_test on all downstream branches
Change-Id: I43b645658f468c23a5b9ebcfcd9d4516537db540
2018-04-05 17:26:35 -07:00
SzuWei Lin 368b0c0c5a Remove adding /odm from GSI makefile
am: d24396d4df

Change-Id: I9f01384203a83e5635bc4d06c6cc225706a4e6e5
2018-03-30 21:15:14 +00:00
SzuWei Lin d24396d4df Remove adding /odm from GSI makefile
The odm/ is default created under the root directory.
We don't need adding /odm mount pointer now in GSI.

Bug: 77297861
Test: build aosp_arm64_ab-userdebug and boot on a Pixel 2 device.
Change-Id: Ied48439f366acc33595b958b75c2f30d8f6ad57e
2018-03-30 13:39:49 +08:00
SzuWei Lin 5a82230285 Merge "Remove redundant BOARD_VNDK_VERSION" into pi-dev
am: dc855f7c85

Change-Id: I07cfe7e94a0e39fe414f565e2693d165e1836690
2018-03-26 19:39:55 +00:00
TreeHugger Robot dc855f7c85 Merge "Remove redundant BOARD_VNDK_VERSION" into pi-dev 2018-03-26 19:34:37 +00:00
SzuWei Lin 3d98bb086b Remove redundant BOARD_VNDK_VERSION
board/treble_common.mk already has the setting.

Bug: 76126824
Test: build aosp_arm64_ab-userdebug pass
Change-Id: I7e3680a1cb36c38bdb29564c39b17b9a16067e21
2018-03-26 11:29:15 +08:00
Bjoern Johansson c8e8aa0030 Allow radio to read emulator network properties
am: a27d4b7270

Change-Id: I61b70ee712760f48707e446edf59896abbebbc64
2018-03-23 22:49:10 +00:00
Bjoern Johansson a27d4b7270 Allow radio to read emulator network properties
A recent change added SELinux labels to the properties used by the DHCP
software and RIL to configure the network. Unfortunately that change
didn't give RIL the permissions needed to read those properties which
broke radio networking for the emulator. Fix it by allowing radio
related code to read the properties again.

BUG: 76211046
Test: Run emulator with -feature -Wifi and verify network connectivity
Change-Id: I7663a6598e2d501ee8336b2dae5fd78ff4ff69bc
2018-03-23 11:26:40 -07:00
Bjoern Johansson 5d145d5e58 Merge changes from topic "emu_wifi_fixes" into pi-dev
am: c6bd5fc81a

Change-Id: Ida600686727bb9f672150a710bbf59a0ed637f2f
2018-03-23 16:01:10 +00:00
Bjoern Johansson 71145103ff Build emulator images with emulator WiFi HAL
am: 275bdb08cd

Change-Id: I95c832768a63b911c4de8c3654372c4227ac9531
2018-03-23 16:00:42 +00:00
Bjoern Johansson 1b6dde54a0 Fix SELinux settings for WiFi in Treble
am: 760871c753

Change-Id: I7865e2c9edf9f3148e5728f8a1a8492730743183
2018-03-23 15:58:55 +00:00
Bjoern Johansson 3aa1249132 Add SELinux configuration for new DHCP programs
am: 3c4b342323

Change-Id: Iab97f3cd28c9499587124a8512809f6deffbcf37
2018-03-23 15:57:47 +00:00
Bjoern Johansson 6764c91986 Enable WiFi for arm, arm64 and x86_64
am: 12fd2d8824

Change-Id: I8ff7d4c2c31db5e2339a3cff767889b57695e81d
2018-03-23 15:56:57 +00:00
Bjoern Johansson ee21ef387d Add support for WiFi in emulator
am: 127395fc8f

Change-Id: I05bff54a221536812e757c09a156c8b3be8f3af4
2018-03-23 15:56:01 +00:00
Bjoern Johansson ca5bfb1ca7 Update SELinux rules to support emulator WiFi
SELinux policies have become stricter, this updates the emulator SELinux
rules to accomodate these changes. It also adds rules for the new
createns command with the accompanying execns changes that are needed
to work with an updated filesystem layout.

BUG: 74514143
Test: Compile emulator images and verify that WiFi works
Change-Id: I4b58cea681a1e41b0cb7368e1c696f74ce28f871
2018-03-22 12:59:49 -07:00
Bjoern Johansson 275bdb08cd Build emulator images with emulator WiFi HAL
Use the new emulator WiFi HAL. This is specified by the
BOARD_WLAN_DEVICE setting. This also requires that the wifi HAL service
is included.

BUG: 74514143
Bug: 68338427
Test: run cts -m CtsIncidentHostTestCases -t
com.android.server.cts.BatteryStatsValidationTest#testWifiDownload
Change-Id: Ib59550b6cfba1e2e8686a5c805cd6b3913e8508e
(cherry picked from commit 23073c6ee33eca56f1ae0c45615b87ec9aec712e)
(cherry picked from commit 2d51c9b2bf0774ac46837a93181c83329e6fc662)
2018-03-22 12:59:20 -07:00
Bjoern Johansson 760871c753 Fix SELinux settings for WiFi in Treble
Update SELinux permissions to work with Treble and the much stricter
SELinux rules.

BUG: 74514143
Test: Compile and manually test that WiFi is working
Change-Id: Ic0a6417fb4fed1597fee70367924e5d59f37e725
(cherry picked from commit 37d7bc2adcc4bfd4c0f03dcddf1c7fbd31e87a4f)
(cherry picked from commit 1b0158a4ab6ca4f05b4b186ec3a080c689492b58)
2018-03-22 12:58:32 -07:00
Bjoern Johansson 3c4b342323 Add SELinux configuration for new DHCP programs
Add the dhcpclient and dhcpserver binary files to the makefile and
file_contexts and give them the appropriate SELinux permissions to run.

BUG: 74514143
Test: Build emulator image and manually verify WiFi functionality
Change-Id: Ia472ef4c86c9b6ba967c0fc7443db607aed1e485
(cherry picked from commit 917bda2587d219e35404a298c05a7179519815c1)
(cherry picked from commit 87b9f937113801b50612863cb13e6391cc1f3105)
(cherry picked from commit 760a19890ac99144f6b143015c36e7aaa3797c73)
2018-03-22 12:58:29 -07:00
Bjoern Johansson 12fd2d8824 Enable WiFi for arm, arm64 and x86_64
Set the required parameters in BoardConfigs to allow WiFi to work on
remaining architectures. Also update SELinux policy needed to make WiFi
work on arm and arm64. This was not required on x86 but refused to work
on arm without these changes.

BUG: 74514143
Test: Build emulator image and manually verify WiFi functionality
Change-Id: Ic645ccf7249f84ae0320770b0ef7b1b6102b7b14
(cherry picked from commit 6d28bfbeefea8fe1919ff0987ae3d935d974dc6d)
(cherry picked from commit 023a7ba64bd3b189a148ad388606ca5747ea20b1)
(cherry picked from commit 9c9cefdafbae50c0e371c30bcccb98a8b7697e98)
2018-03-22 12:57:41 -07:00
Bjoern Johansson 127395fc8f Add support for WiFi in emulator
Add required SELinux permissions to run services required for WiFi and
network namespaces. Add required executables and files required to run
WiFi services such as hostapd to create an access point and
wpa_supplicant to connect to it.

BUG: 74514143
Test: Build emulator image and manually verify WiFi functionality
Change-Id: I38461b878abcaae842b4656dea82792e23100174
(cherry picked from commit 21c5c3dcf91b1be71abe8618e2eb31529438e325)
(cherry picked from commit 68a36140f7a3a766b8adc16cd85c2f0c81bfb44b)
(cherry picked from commit e6dab593b8eebccb1e6311e626c8aca943ba6933)
2018-03-22 12:57:36 -07:00
Bo Hu 2edc945376 Merge "emulator: allows drm hal vendor access" into pi-dev
am: 3972c88026

Change-Id: Ib672572f01a091e18e17d43a073778be6d417c31
2018-03-21 21:54:46 +00:00
bohu a9127502d3 emulator: allows drm hal vendor access
BUG: 76029272
Change-Id: Ib4de8b4cd5cf5899bee23c798156006d3680ab8d
2018-03-21 10:24:25 -07:00
Greg Hartman cc58db6cda Merge "Increase size of data to accomodate ASAN and CTS" into pi-dev
am: 5051158eb5

Change-Id: If1079f64f0bc7fdb0a07ccae9e545db1cccd2344
2018-03-20 02:50:42 +00:00
Steven Moreland 062fe37593 Merge "generic: BOARD_VNDK_VERSION := current" am: 252ff3d6b6
am: d7adba6ae5

Change-Id: Ib9589451b5386ae73884ec77a2a8b8d6c7cc7d6b
2018-03-16 21:52:46 +00:00
Steven Moreland 7795922410 Merge "generic_arm64: BOARD_VNDK_VERSION := current" am: d466d2389d
am: f44560e86c

Change-Id: I3024ec6ae3279845bc3ab61953e549060c110c85
2018-03-16 21:51:55 +00:00
Treehugger Robot 252ff3d6b6 Merge "generic: BOARD_VNDK_VERSION := current" 2018-03-16 21:28:15 +00:00
Steven Moreland 5ee470be27 generic: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch generic-userdebug, m -j, emulator (hangs >2 hours)

Change-Id: I377ab1ba2a5aea75096b27a1ec2366abf9d71fc4
2018-03-15 16:41:33 -07:00
Steven Moreland adb7d43b5e generic_arm64: BOARD_VNDK_VERSION := current
Bug: 70694532
Bug: 69526027
Test: lunch sdk_gphone_arm64-userdebug, build, boot complete
    (unrelated /system/bin/sdcard crash)
Change-Id: I90a05f43caa479288b812075d06f57dae0a2fb2c
2018-03-15 15:19:06 -07:00
Greg Hartman 2bfe38144f Increase size of data to accomodate ASAN and CTS
BUG: 74946342
Test: Local build works
Change-Id: I17e9973549ba96edb7cfbd574f68a2bc0bf55f98
2018-03-15 11:06:02 -07:00
Yahan Zhou cf50451225 Merge "Add board name for emulator" am: 39acbe6446 am: 0547230ac1
am: dddbf1fecb

Change-Id: I2783184d28c2987c481bc1aa0b3f1a5941996896
2018-02-28 18:59:28 +00:00
Yahan Zhou dddbf1fecb Merge "Add board name for emulator" am: 39acbe6446
am: 0547230ac1

Change-Id: Ia998564a709841a7ab162891164f73aea639b7d4
2018-02-28 18:53:20 +00:00
Yahan Zhou 12b5395c2f Add board name for emulator
VTS checks for ro.product.board before running. Emulator does not have
that value and causes an exception.

So let's add it to the emulator and call it goldfish_$(TARGET_ARCH).

BUG: 73741117
Test: vts-tradefed run vts, should run the tests
Change-Id: I6b00f2923bc9609d4d05c45d47ceddd2bd7be091
2018-02-27 18:11:48 -08:00
Nick Kralevich ad80d5461b Merge "remove nnk from OWNERS" am: d6fa5bbc51 am: 439ecf8088
am: ee79f54630

Change-Id: I524d927a255b1b4b13a033a95d49466fece9d0eb
2018-02-27 19:34:32 +00:00
Nick Kralevich ee79f54630 Merge "remove nnk from OWNERS" am: d6fa5bbc51
am: 439ecf8088

Change-Id: Ic428009c4d93f44354f16edb52b4bbb117a1ea6b
2018-02-27 19:27:30 +00:00
Nick Kralevich 0aa64275e8 remove nnk from OWNERS
See https://android-review.googlesource.com/c/platform/system/sepolicy/+/626014

Also remove klyubin who is no longer at Google.

Test: none
Change-Id: I98534c0cc676e41129b73331ad0e71e7fc1aa1ab
2018-02-27 09:15:10 -08:00
Justin Yun 5bbc56f825 Merge "Create firmware and persist in GSI for arm_ab" am: 19db058484 am: 308fbbdb54
am: ffffefd791

Change-Id: I38828c768cfd363f3a05fea074d9c48ed11c041c
2018-02-27 00:26:42 +00:00
Justin Yun ffffefd791 Merge "Create firmware and persist in GSI for arm_ab" am: 19db058484
am: 308fbbdb54

Change-Id: Id8df567bb351cc02859055c10cf37a9c3f1c82fd
2018-02-27 00:20:00 +00:00
Justin Yun 38e934a38e Create firmware and persist in GSI for arm_ab
Some SoC vendors require firmware and persist directores to mount.
This must be provided in GSI for arm_ab not only for arm64_ab.
Once the directories are moved to /vendor, these policies for root
must be removed.

Bug: 36764215
Bug: 73720182
Test: GSI boot with 32bit devices
Change-Id: Ic5c6bb615c39853d51d233c00d2d9e8ee2c57802
2018-02-26 23:10:47 +00:00
Bo Hu c75bf85314 Merge "emulator: remove opengles property" am: c187fdf751 am: 438eebab81
am: 6dc9db6051

Change-Id: Ic3c9c3b70f20f88fa507411ae55f06040140aa35
2018-02-23 23:18:25 +00:00
Bo Hu 6dc9db6051 Merge "emulator: remove opengles property" am: c187fdf751
am: 438eebab81

Change-Id: I5d616d60bb4e082d493fb66f49c4abfb0fcd7c64
2018-02-23 23:11:47 +00:00
bohu 70fefe0066 emulator: remove opengles property
BUG: 73812167
Change-Id: I5bdc475c6bdd5bdcb32c5a12f49c18c6a391b95c
2018-02-23 09:08:45 -08:00
bohu b654f33a0f Merge "emulator: grant fingerprint hal data permission" am: b2cc4ddafd am: 96fecf5b08
am: 58a877d853

Change-Id: Ie510c648c6e85c497f32879a9cc4c07bc1a85b20
2018-02-15 17:02:27 +00:00
bohu 58a877d853 Merge "emulator: grant fingerprint hal data permission" am: b2cc4ddafd
am: 96fecf5b08

Change-Id: If1bc358d6a761146ec86af0ccf84613b2fff325d
2018-02-15 16:54:57 +00:00
bohu 72fa12db3c emulator: grant fingerprint hal data permission
Test: build sdk_gphone_x86-userdebug
launch emulator, enroll fingerprint, close emulator
relaunch emulator, check previously enrolled fingerprint still work

Change-Id: I27552509368f08cc6a7aa52b0e9efc5ae952469d
2018-02-14 15:37:31 -08:00
Michael Wright 74e5ccb28b Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036 am: e869d4e158
am: 80a013a7e2

Change-Id: I30ffb6bc51f7e41c5a90472d078ba8f47384402e
2018-02-07 15:25:19 +00:00
Michael Wright 80a013a7e2 Merge "Revert "Correct some GSI settings to board makefile"" am: 0b733a2036
am: e869d4e158

Change-Id: I690d03dbee97f97fb98e67f403dce7654f3d0810
2018-02-07 15:19:44 +00:00
Michael Wright 0b733a2036 Merge "Revert "Correct some GSI settings to board makefile"" 2018-02-07 15:11:07 +00:00
Michael Wright 87163300c2 Revert "Correct some GSI settings to board makefile"
This reverts commit 6e96487968.

Reason for revert: build_test broken by this change.

Change-Id: I0f48bb84dc8c521540c745814daa11c2900ac2c8
2018-02-07 12:08:51 +00:00
SzuWei Lin fce672a2bd Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0 am: 0c6f675b62
am: 2646ca50e5

Change-Id: If8bb17c3477b474c5f96130e1a5db4c20ab0a4a0
2018-02-07 10:42:30 +00:00
SzuWei Lin 2646ca50e5 Merge "Correct some GSI settings to board makefile" am: 2f7f7ca1c0
am: 0c6f675b62

Change-Id: I32de3a5d39b9759bb3dcdde930a314c2e7833cb0
2018-02-07 09:14:43 +00:00
Treehugger Robot 2f7f7ca1c0 Merge "Correct some GSI settings to board makefile" 2018-02-07 09:02:40 +00:00
Yifan Hong 2c2a24421a Merge "Move system manifest / device matrix build rules" am: fe34c5b52c am: 6e79817411
am: 19687f25f0

Change-Id: I897635ade816d146f41ef3a3421e16446e9d0252
2018-02-06 02:29:27 +00:00
Yifan Hong 19687f25f0 Merge "Move system manifest / device matrix build rules" am: fe34c5b52c
am: 6e79817411

Change-Id: I1590e890c63218451c4ecf56d5526c9edda38e1d
2018-02-06 02:21:50 +00:00
Yifan Hong 87328762e4 Move system manifest / device matrix build rules
Test: build these files
Change-Id: I6467f4b7ce421358c30ad7a4c72a77dcc2ed3f88
2018-02-01 15:36:40 -08:00
SzuWei Lin 6e96487968 Correct some GSI settings to board makefile
TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS should
be board config variables. Move them to
target/board/treble_common_64.mk

Bug: 70951849
Test: lunch aosp_arm64_ab-userdebug; make -j
Change-Id: Ia3f6d5db1a7edc956597ab34c2feed088ecc6062
2018-01-30 17:23:47 +08:00
Tri Vo b97219cf3e Merge "Fix /sys denials." am: d8e3c4eb07 am: 55bb62895e
am: abdf6ef257

Change-Id: I54779227cbea868c6577b9df409fff7315562100
2018-01-29 22:22:58 +00:00
Tri Vo abdf6ef257 Merge "Fix /sys denials." am: d8e3c4eb07
am: 55bb62895e

Change-Id: I6507cb7c04af3e61984ea57dea553f13386403cb
2018-01-29 22:15:38 +00:00
Tri Vo 84925da809 Merge "healthd: fix /sys denials." am: 88114b0b0b am: 09f34add81
am: a7c4cc4b1d

Change-Id: I85be1510a81a8457232d16ba2a5dc4273bc85433
2018-01-25 03:08:37 +00:00
Tri Vo a7c4cc4b1d Merge "healthd: fix /sys denials." am: 88114b0b0b
am: 09f34add81

Change-Id: Iee7f7c30ed91ca6ddf126c3ce4dfa2349147349f
2018-01-25 03:02:09 +00:00
Tri Vo 82ca9a743a Fix /sys denials.
Labeled files linked from /sys/class/{rtc, net}.
Fixes these denials:
avc: denied { read } for pid=6413 comm="system_server" name="hctosys"
dev="sysfs" ino=10068 scontext=u:r:system_server:s0
tcontext=u:object_r:sysfs:s0 tclass=file permissive=0

avc: denied { write } for pid=4785 comm="Binder:4785_2" name="mtu"
dev="sysfs" ino=9213 scontext=u:r:netd:s0 tcontext=u:object_r:sysfs:s0
tclass=file permissive=0

Test: files labeled as expected; emulator boots without above denials.
Change-Id: I8fd8cc993ede0ddfd4404c0647a60da4867ef128
2018-01-24 12:39:47 -08:00
Tri Vo 30a532a1bf healthd: fix /sys denials.
Label /sys/class/power_supply/* appropriately and give healthd read
permissions to that directory.

Fixes this denial:
avc: denied { read } for pid=1386 comm="healthd" name="power_supply"
dev="sysfs" ino=2562 scontext=u:r:healthd:s0
tcontext=u:object_r:sysfs:s0 tclass=dir permissive=0

Bug: 72437093
Test: emulator boots with no denials from healthd
Change-Id: Ie3853cb5e9167fcd70f393ff589971ad6212c580
2018-01-24 11:13:22 -08:00
Yifan Hong 1909b0c362 Merge "Add System SDK Versions to VINTF." am: c4d2725fc6 am: 1738a2315a
am: fed5564e84

Change-Id: Ic33c36bce173753d67918f6a94886ec7a7e6c0e0
2018-01-23 03:17:42 +00:00
Yifan Hong fed5564e84 Merge "Add System SDK Versions to VINTF." am: c4d2725fc6
am: 1738a2315a

Change-Id: I49be38ceec32d811eab11b45339e24c35c0faef0
2018-01-23 03:12:36 +00:00
Yifan Hong 5ff1f0a38a Add System SDK Versions to VINTF.
Add PLATFORM_SYSTEMSDK_VERSIONS to framework manifest
and BOARD_SYSTEMSDK_VERSIONS to device comp matrix.

Test: m framework_manifest.xml -j
Test: BOARD_SYSTEMSDK_VERSIONS=P m device_compatibility_matrix.xml -j

Bug: 69088799
Change-Id: I0b5ac6f1c2802c353b2989b017c1cdfc9fe27987
2018-01-22 14:18:16 -08:00
Yifan Hong b746367c09 Merge "move VINTF metadata to /etc/vintf/ ." am: 65310d6b06 am: c77baebc5a
am: d203244288

Change-Id: Iad76b3ddfbcc922778e788ef597b9995bc7356c2
2018-01-19 22:23:04 +00:00
Yifan Hong d203244288 Merge "move VINTF metadata to /etc/vintf/ ." am: 65310d6b06
am: c77baebc5a

Change-Id: I542d0337358c9fecb8e588351bfe878864f7ba77
2018-01-19 22:18:00 +00:00
Yifan Hong 65310d6b06 Merge "move VINTF metadata to /etc/vintf/ ." 2018-01-19 22:01:28 +00:00
Yifan Hong 8f863693c9 move VINTF metadata to /etc/vintf/ .
In particular,
/vendor/manifest.xml => /vendor/etc/vintf/manifest.xml
/system/manifest.xml => /system/etc/vintf/manifest.xml
/vendor/compatibility_matrix.xml =>
    /vendor/etc/vintf/compatibility_matrix.xml

Test: verify that fileis exist in destination
Test: hwservicemanager can read these files
Bug: 36790901
Change-Id: Ic361a48e170fb9a77faec76ad0e829625427820d
2018-01-19 10:52:27 -08:00
SzuWei Lin 71a177265a Merge "Normalize the 2nd CPU architect of 64 bits arm GSI" am: 469aafe421
am: b52566c2ba

Change-Id: I8d46455eaf1f0d1ec6a753b569704beff5997695
2018-01-19 04:34:22 +00:00
Treehugger Robot 469aafe421 Merge "Normalize the 2nd CPU architect of 64 bits arm GSI" 2018-01-19 04:26:40 +00:00
bohu 96e73cd33d Merge "emulator: enable 32bit x86 to run on 64bit kernel" am: 7e41fb46db am: d7c34ffac8
am: dbcfacd5f1

Change-Id: Ia2a5f2ad2d893abb1db7a9681e4360e34beab2f9
2018-01-19 02:17:49 +00:00
bohu dbcfacd5f1 Merge "emulator: enable 32bit x86 to run on 64bit kernel" am: 7e41fb46db
am: d7c34ffac8

Change-Id: Ieb72c8c6df1dab3356d1d1c5b5e98c7a4b7939b1
2018-01-19 02:13:33 +00:00
bohu 1695288dc0 emulator: enable 32bit x86 to run on 64bit kernel
BUG: 71861550
Change-Id: Iea8fae11375d66a141babd40f66dd2e3da6075e0
2018-01-18 22:26:32 +00:00
Yifan Hong 61601f2c65 Merge "add <vendor-ndk> to VINTF." am: 3fbfab7896 am: 1ddb619dc4
am: 3b1c37edfc

Change-Id: I320003ec3620353df637acc635368ab19b234bea
2018-01-18 01:01:44 +00:00
Yifan Hong 3b1c37edfc Merge "add <vendor-ndk> to VINTF." am: 3fbfab7896
am: 1ddb619dc4

Change-Id: I2a2891d46a2bdae39101411d0f45bc6eae9fd2f4
2018-01-18 00:59:28 +00:00
Yifan Hong 238c6ba8fe add <vendor-ndk> to VINTF.
Test: libvintf_test
Test: vintf_object_test
Test: build and verify that <vendor-ndk> tags
are in framework manifest and device compatibility
matrix.

Fixes: 36400653

Change-Id: I4d44bff81fecc8fd2f7ab8e15770544b7b85aef9
2018-01-16 21:49:52 +00:00
Yifan Hong 64b824d3c1 Merge "framework_cm.xml: move to hardware/interfaces" am: 1e7ab9db8f am: 32faacadf0
am: 1017eaa38c

Change-Id: I17fdf26b20fcaad58f5d6170e59450d23ae92804
2018-01-11 19:28:38 +00:00
Yifan Hong 1017eaa38c Merge "framework_cm.xml: move to hardware/interfaces" am: 1e7ab9db8f
am: 32faacadf0

Change-Id: I7f3e2ea415982411c17b7cb87295b6fe70df6365
2018-01-11 19:23:57 +00:00
Yifan Hong 1e7ab9db8f Merge "framework_cm.xml: move to hardware/interfaces" 2018-01-11 19:14:24 +00:00
Nicolas Geoffray 11f9f96913 Merge "Remove copy/paste code." am: 08e7159672 am: 0cd49dcaf2
am: a66c727b7b

Change-Id: Ib476e253efdb2544b70cc4693d8428518438d989
2018-01-11 09:29:24 +00:00
Nicolas Geoffray a66c727b7b Merge "Remove copy/paste code." am: 08e7159672
am: 0cd49dcaf2

Change-Id: I5a8911c30a563f6a49880ae79790e30d1b161c04
2018-01-11 09:26:14 +00:00
Nicolas Geoffray 08e7159672 Merge "Remove copy/paste code." 2018-01-11 09:20:05 +00:00
Yifan Hong 919dcf1b6e framework_cm.xml: move to hardware/interfaces
Test: m dist
Bug: 69636193

Change-Id: Ic15a445d700552cb0973d6919ed5843bdecba363
2018-01-10 16:32:04 -08:00
Tri Vo 2d3e61c848 Merge "bootanim: remove access to vendor_file type" am: e320da7dce am: 43f0f6d197
am: 654b55305f

Change-Id: Ib37f765824760864c63a445926a5fa2dab7f077e
2018-01-10 22:55:53 +00:00
Tri Vo 654b55305f Merge "bootanim: remove access to vendor_file type" am: e320da7dce
am: 43f0f6d197

Change-Id: I72b888f6a3fab6a65ee4b6c5a71026d571073f71
2018-01-10 22:44:40 +00:00
Tri Vo c727d6d40e bootanim: remove access to vendor_file type
This domain should instead depend on same_process_hal_file, to which all
domains already have access.

Bug: 70990973
Test: emulator -gpu guest; boots with no denials from bootanim.
Change-Id: Ic577dd3c3895f8471d68a0da245d37a17cd6a3f3
2018-01-10 09:13:44 -08:00
Nicolas Geoffray b7c5e3bbb9 Remove copy/paste code.
The options passed are already the default.

This is also to reduce the difference between user and userdebug
related to dexopt.

Test: m
Change-Id: Id62c38f145909b511761b471160028915000fc23
2018-01-10 10:01:11 +00:00
Dan Willemsen 3a8af7b92b Merge "Remove armv5te" am: 139f458ced am: 1211033f98
am: 179982709b

Change-Id: I5ddaada37528d635af9fbb3c585f0ea404529b22
2018-01-09 05:30:19 +00:00
Dan Willemsen 179982709b Merge "Remove armv5te" am: 139f458ced
am: 1211033f98

Change-Id: I831c073913e0ba75882130fd6d81e1c786e3af75
2018-01-09 05:09:26 +00:00
Dan Willemsen dd3a27394f Remove armv5te
This architecture only existed for unbundled use, but even the NDK is
removing support in their r17 release, so just remove support for it.

Test: build/soong/build_test.bash -only-config
Test: check buildserver configs, I don't see anything still using armv5
Change-Id: Ic183b510c9ada94438bd4cc2b9362fa438a29ced
2018-01-08 15:26:16 -08:00
SzuWei Lin 2a1e87c92a Merge "Correct some GSI settings to board makefile" am: b2e9b2b34f
am: c32a3396a9

Change-Id: Id008f877e63bf77192396f706b27c291b5c48cab
2018-01-05 08:26:34 +00:00
Treehugger Robot b2e9b2b34f Merge "Correct some GSI settings to board makefile" 2018-01-05 08:17:44 +00:00
SzuWei Lin 43672c0fc5 Normalize the 2nd CPU architect of 64 bits arm GSI
In order to let GSI more generic. Normalize the 64 bits arm GSI
to be:

    TARGET_2ND_ARCH_VARIANT := armv8-a
    TARGET_2ND_CPU_VARIANT := generic

Bug: 64775084
Test: Build pass and boot to home screen
Change-Id: I1dd5aa8524c1d243f832372bf7e3e64fae09e945
Merged-In: I1dd5aa8524c1d243f832372bf7e3e64fae09e945
2018-01-04 11:07:29 +08:00
SzuWei Lin 8d0ca8df5b Correct some GSI settings to board makefile
Some setting currently in target/product/treble_common.mk, but
they should be board config variables. So, move them to
target/board/treble_common.mk.

Bug: 70951849
Test: Build pass and check on a Pixel device with GSI
Change-Id: I511fbc481583555182dab76503e67c5f56efa8eb
2017-12-26 12:07:48 +08:00
SzuWei Lin 83890eb262 Correct some GSI settings to board makefile
Some setting currently in target/product/treble_common.mk, but
they should be board config variables. So, move them to
target/board/treble_common.mk.

Bug: 70951849
Test: Build pass and check on a Pixel device with GSI
Change-Id: I511fbc481583555182dab76503e67c5f56efa8eb
Merged-In: I511fbc481583555182dab76503e67c5f56efa8eb
2017-12-26 03:36:33 +00:00
Steven Moreland ed48e5954a Merge "Allow devices to extend the system manifest." am: 15820578b2 am: 152a886de3
am: aac4256fd2

Change-Id: I8c42fd4b758466032cec45a762b079979d0f4fa6
2017-12-23 01:28:37 +00:00
Steven Moreland aac4256fd2 Merge "Allow devices to extend the system manifest." am: 15820578b2
am: 152a886de3

Change-Id: Id9c2f1be2b56c17fb8417a452b42bb98b4aa7b24
2017-12-23 01:25:37 +00:00
Steven Moreland b14b530f82 Allow devices to extend the system manifest.
Introduces DEVICE_FRAMEWORK_MANIFEST_FILE, a list
of files which are added to system/manifest.xml.
This is required for devices to properly display
what hals they implement and also therefore for
them to pass vts_treble_vintf_test since it
now tests manifests based on hal origin.

Notice, this is named singularly to match
DEVICE_MANIFEST_FILE which is also a list of files.
They may be better both named "FILES", but for
consistency and legacy reasons, they can be thought
of as "everything that composes the X manifest
file".

Fixes: 70042049
Test: add system manifest extension which needs it
  and it no longer fails vts_treble_vintf_test for
  hals being served from the wrong partitions.

Change-Id: I1f59d5c3cadb7a7d4576b73196ca7b41103a49c5
2017-12-22 14:02:11 -08:00
Yifan Hong 23373452d4 Merge changes from topic "fcm_version" am: b1b5a0969b
am: 5ac5e6b757

Change-Id: I5e11aa05336756b2756cb19ae8fec94ca696c2c9
2017-12-15 19:13:04 +00:00
Yifan Hong f663d1ca4d Merge "Rename VINTF XML module names" am: d8d276c5a6 am: fcdf772f67
am: d2c5a38dcb

Change-Id: I330b9c4aa322cf27ba4645c3d9a57859cb5f8ae8
2017-12-15 19:00:02 +00:00
Yifan Hong b1b5a0969b Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-15 18:58:34 +00:00
Yifan Hong d2c5a38dcb Merge "Rename VINTF XML module names" am: d8d276c5a6
am: fcdf772f67

Change-Id: Ic16692b74336cf7019b022b83c88921c756a0fe7
2017-12-15 18:57:28 +00:00
Yifan Hong 43ec6ead28 Rename VINTF XML module names
* system_compatibility_matrix/manifest.xml
   => framework_...
* compatibility_matrix/manifest.xml
   => device_...

This is to follow the naming scheme in VINTF
doc.

Test: build all four targets

Change-Id: If5f6a99ded9964f3500c8e5fb97278f8fd0de387
2017-12-14 18:19:44 -08:00
Yifan Hong ed42caf94d Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
Merged-In: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-14 15:35:15 -08:00
Yifan Hong 86f57bd9f2 Merge changes from topic "fcm_version"
* changes:
  Move fwk comp mat level logic into assemble_vintf
  PRODUCT_COMPATIBILITY_MATRIX_LEVEL_OVERRIDE is deprecated.
2017-12-14 01:26:58 +00:00
Yifan Hong a7443c3bbb Move fwk comp mat level logic into assemble_vintf
Deprecation schedule requirements is specified in assemble_vintf.
Move all checking logic to assemble_vintf.

Test: builds

Bug: 69636193
Change-Id: I2d62555633494014dc0005931de6c8ae9e6877fa
2017-12-13 12:16:17 -08:00
Colin Cross 426ecd0f60 Merge "Replace build/tools with build/make/tools" am: 973301af79 am: e6dc6b2026
am: eb6c8444a6

Change-Id: I14d033658d219e81790ab1e730b7e477c70f4a13
2017-12-13 03:03:47 +00:00
Colin Cross eb6c8444a6 Merge "Replace build/tools with build/make/tools" am: 973301af79
am: e6dc6b2026

Change-Id: Ie3eb9e2b411603f95f91cac79ebe56eb78423da3
2017-12-13 02:49:40 +00:00
Treehugger Robot 973301af79 Merge "Replace build/tools with build/make/tools" 2017-12-13 02:34:42 +00:00
SzuWei Lin 7494beccb3 Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad
am: 90cb321f88

Change-Id: I6df8c64d5fb0176b09e77eed0f90f569586814d5
2017-12-12 05:02:32 +00:00
Treehugger Robot 6553fd6cad Merge changes I8f20db07,Id3a8dd20,I0275a5d4
* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI
2017-12-12 04:50:26 +00:00
Isaac Chen 18c29a2ffb Merge "Enable VNDK for aosp_x86 and aosp_x86_64" am: 966e080ade
am: d3d7c2e180

Change-Id: I6699688bda4ed7d7b057c7a423c8622dc5065309
2017-12-12 04:35:15 +00:00
SzuWei Lin 596c026fd6 Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass and boot to home screen on a Pixel device with GSI
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
Merged-In: I8f20db0798a07e63c453a9fe64638b99b41cd166
(cherry picked from commit 7323f1d4ec)
2017-12-11 02:05:50 +00:00
Isaac Chen d9fed02138 Enable VNDK for aosp_x86 and aosp_x86_64
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.

Enable VNDK version causes it to be built under vendor directory.

Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
Merged-In: I6356ffe4a806b3d8fc79057bf772d139209a5f11
(cherry picked from commit 532d5adf7b)
2017-12-07 15:03:25 +08:00
Colin Cross fdea893833 Replace build/tools with build/make/tools
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Bo Hu d68768aa41 Merge "emulator: allows goldfish to disable bootanimation" am: 303a5f0c2d am: e262a65a1d
am: 2076ee8eaf

Change-Id: Ida8fe806de355e64606885a50b5078367f446711
2017-12-05 22:15:16 +00:00
Bo Hu 2076ee8eaf Merge "emulator: allows goldfish to disable bootanimation" am: 303a5f0c2d
am: e262a65a1d

Change-Id: Ib7e8064b3aca27c6324d002784270d015c07b9ac
2017-12-05 22:09:04 +00:00
Bo Hu e262a65a1d Merge "emulator: allows goldfish to disable bootanimation"
am: 303a5f0c2d

Change-Id: I153a54fca751889aac73ffd54fd9197188599596
2017-12-05 22:03:55 +00:00
bohu 7b46d578e7 emulator: allows goldfish to disable bootanimation
[    2.447332] type=1400 audit(1512424670.440:8): avc: denied { write } for pid=1408 comm="setprop" name="property_service" dev="tmpfs" ino=1216 scontext=u:r:goldfish_setup:s0 tcontext=u:object_r:property_socket:s0 tclass=sock_file permissive=0
[    2.455350] init: Created socket '/dev/socket/adbd', mode 660, user 1000, group 1000
console:/ $ [    2.470594] init: Service 'ranchu-setup' (pid 1387) killed by signal 1

BUG: 70176291

Change-Id: I309ff3cb89ec01673e84fb275fe795f95711edd6
2017-12-05 09:10:16 -08:00
Bo Hu d78a7ceb7f Merge "emulator: api 26 fix guest rendering (build)" am: fb46f47085
am: c6e1046dfb

Change-Id: I5dcd84170c6f9ac7be5ef155263bfae10de93b6e
2017-12-01 20:35:40 +00:00
Bo Hu c6e1046dfb Merge "emulator: api 26 fix guest rendering (build)"
am: fb46f47085

Change-Id: Ifb7faacf00ce8af275868869e324fe25e9e9c64a
2017-12-01 20:27:37 +00:00
Lingfeng Yang 8bed4d0ce6 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
Merged-In: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-12-01 08:57:53 -08:00
Isaac Chen 532d5adf7b Enable VNDK for aosp_x86 and aosp_x86_64
When VNDK version is not enabled, libminijail.so are built under
system directory. It is not found in GSI, though.

Enable VNDK version causes it to be built under vendor directory.

Bug: 69395141
Test: Both of the following 2 products can boot to home screen.
    $ lunch aosp_x86-userdebug; m -j; emulator
    $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I6356ffe4a806b3d8fc79057bf772d139209a5f11
2017-12-01 11:21:58 +08:00
bohu 5909b07cc4 Merge "emulator: support system-as-root" am: 44e363f1e3
am: 253dfc22a6

Change-Id: I9eab659873195ee7a46e8fc83556a0a5b011d746
2017-11-30 20:16:28 +00:00
bohu 253dfc22a6 Merge "emulator: support system-as-root"
am: 44e363f1e3

Change-Id: Ib1ea4ec4f388a1d28f6db2789029aa06c169c3da
2017-11-30 20:12:53 +00:00
TreeHugger Robot 9eda23256e Merge "emulator: support system-as-root" 2017-11-30 20:02:42 +00:00
bohu e9046cbbaa emulator: support system-as-root
BUG: 69770927

Test: build sdk_gphone_x86-userdebug, boot up
to home with Tot emulator

Test: build sdk_phone_armv7-userdebug, boot up
to home with Tot emulator

Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c
Merged-In: I39348bf35cb748c08ed68a048389bbfc2279a91c
2017-11-29 22:08:28 -08:00
bohu d445fbedb4 emulator: support system-as-root
BUG: 69770927

Test: build sdk_gphone_x86-userdebug, boot up
to home with Tot emulator

Test: build sdk_phone_armv7-userdebug, boot up
to home with Tot emulator

Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c
2017-11-29 21:44:46 -08:00
TreeHugger Robot e0682e6dbe Merge "Enable VNDK runtime checking" 2017-11-29 03:55:30 +00:00
Lingfeng Yang 207413d056 emulator: api 26 fix guest rendering (build)
As swiftshader is open sourced, put it into emulator
targets to enable -gpu guest option.

Test: build aosp_x86-eng, launch emulator -gpu guest
and it should boot to home screen.

Change-Id: I2140d7cec28d5f00b7463b1d37d9cf62120398fb
2017-11-22 12:45:35 -08:00
SzuWei Lin 7323f1d4ec Enable VNDK runtime checking
GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1,
but disabled VNDK runtime checking. This patch enables the checking

Bug: 69393797
Test: Build pass
Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166
2017-11-17 12:53:35 +08:00
TreeHugger Robot b0260c26ed Merge "Enlarge 32bit GSI size setting" 2017-11-15 21:40:15 +00:00
Po-Chien Hsueh 659f64fb43 Enlarge 32bit GSI size setting
Many modules are growing in size on master. 768MB is not enough for
32bit GSI anymore. Enlarge the setting to 900MB.

Bug: 69088572
Test: lunch aosp_arm_a(b); make systemimage
Change-Id: I2e93f6ef38a09a9ac7ba36f831faf57af17bbdc4
2017-11-15 23:42:33 +08:00
Xin Li 44dd4881de Merge commit '66b8b530187b129934a685bf0c4349eef00e4b0c' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I7594bb72dd7e847292eb502edd918e41318aac29
Merged-In: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-11-14 11:36:22 -08:00
Steven Moreland c0a49f8784 Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023 am: cb71efa50a
am: 18d75a29c3

Change-Id: I2388eaf9edb0f25a4518c3b7d857404a2307189a
2017-11-13 21:18:20 +00:00
Steven Moreland 18d75a29c3 Use PRODUCT_ENFORCE_VINTF_MANIFEST. am: 9588438023
am: cb71efa50a

Change-Id: I01e7bd1eeba8ef1f9203f8d2256b862591663e9e
2017-11-13 21:14:05 +00:00
Steven Moreland 9588438023 Use PRODUCT_ENFORCE_VINTF_MANIFEST.
PRODUCT_FULL_TREBLE is being split up into smaller,
more manageable flags.

Bug: 62019611
Test: manual
Change-Id: I046f9eb4099cf441842f3d0e6908d99df063c27e
2017-11-13 09:32:24 -08:00
bohu 30b232885a emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: I85dfbc3acdcbdf0431d4657c7d664ac4c781736b
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-10-26 16:45:05 -07:00
bohu 97252db917 emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I332bc4dfa958f5213a8650c7314963b6bf33d519
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-10-26 16:45:05 -07:00
bohu 813249bfdf emulator: squash misc modifications from oc-emu-dev
Change-Id: Ia6c3ff0805b88ef284524a4e6faa5615016b359c
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-10-26 16:45:05 -07:00
bohu 4a6cc6a8fc emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: Ib25ae4a1c7f86ef20a45af2f88732067ad95c5f4
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-10-26 16:45:05 -07:00
bohu cb0bebbeda build-emulator: fully treblize emulator image
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.

BUG: 37511975

Test: build user build, launch emualtor, run CTS.

Change-Id: I7f5317d52e552367a1390789fe7ce6e0955ba8de
Merged-In: I70f58947e98b41b195d77b4347d2efdc09348392
2017-10-26 16:45:05 -07:00
Yahan Zhou 3afe69d846 Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I330adc6da2999031d4ed2d8c4ade4667c1d0b511
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-10-26 16:45:05 -07:00
Yabin Cui cba9c4af34 Merge "Use armv7-a when building sdk." am: 42c9da3ef7 am: 18b83792e3
am: ad216f840f

Change-Id: I02ca577a73dfdea7e846c46828ca166c3572185a
2017-10-24 21:34:32 +00:00
Yabin Cui ad216f840f Merge "Use armv7-a when building sdk." am: 42c9da3ef7
am: 18b83792e3

Change-Id: If44428f4df666fadf446aede178eb572f3f2a4e1
2017-10-24 21:32:01 +00:00
Yabin Cui 42c9da3ef7 Merge "Use armv7-a when building sdk." 2017-10-24 21:18:33 +00:00
Tri Vo 3904285fab Merge "Label emulator devicetree dir." am: 8716646d63 am: 73d36f64b1
am: 7fd5858547

Change-Id: Ib518ea518a10cb6133b886594e6ca9f5bb75aa70
2017-10-24 20:55:53 +00:00
Tri Vo 7fd5858547 Merge "Label emulator devicetree dir." am: 8716646d63
am: 73d36f64b1

Change-Id: I3945cb34c9d41a2834b1da85a980ac335bf2fa58
2017-10-24 20:45:38 +00:00
Tri Vo 8716646d63 Merge "Label emulator devicetree dir." 2017-10-24 20:36:22 +00:00
Yabin Cui 1fe7ac7534 Use armv7-a when building sdk.
Bug: http://b/68201917
Test: make sdk.
Change-Id: I7817bc03beb109b4152d3bc751f0d2438cc93e3b
2017-10-24 12:44:13 -07:00
Tri Vo e275275d31 Label emulator devicetree dir.
Bug: 67416435
Test: booted emulator and checked that
/sys/bus/platform/devices/ANDR0001:00/properties/android/ is labeled
as sysfs_dt_firmware_android
Change-Id: Ib90552b1ccaa8ddcc389e6829221ba63075df7ed
2017-10-20 16:26:22 -07:00
SzuWei Lin 45e36d65d3 Merge "Add make_f2fs into GSI" into oc-mr1-dev am: 4c06d64955
am: 00033a8bfd

Change-Id: Ib307b99e429907e1dccdfd7e4e9911abbfee9e5b
2017-10-19 18:00:35 +00:00
SzuWei Lin 00033a8bfd Merge "Add make_f2fs into GSI" into oc-mr1-dev
am: 4c06d64955

Change-Id: I4a055848eb7652ecc567b9036976510b42a4fb5d
2017-10-19 17:41:34 +00:00
SzuWei Lin c867f1b681 Add make_f2fs into GSI
The userdata partition of some devices is formatted in f2fs,
and could be formatted in runtime. This is a configurable
feature of AOSP, so GSI enables the setting:

    TARGET_USERIMAGES_USE_F2FS

to support it.

Bug: 67916560
Bug: 66925248
Test: build pass and check the make_f2fs in the image
Test: boot a pixel device with GSI to home screen
Change-Id: Id350c4e07a9c0dc0f0a547b3146626053c88b8ab
2017-10-19 02:07:35 +00:00
Mathieu Chartier 6c1aa4584a Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY"
am: dcb1f24e9b

Change-Id: I4cc653c7d4218d2e4b983f4ec1b6f8df77b2d1f4
2017-10-12 22:37:24 +00:00
Mathieu Chartier f834eccd52 Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
Renamed WITH_DEXPREOPT_BOOT_IMG_ONLY to
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY and changed the
behavior accordingly.

Preopt system server jars since selinux prevents system server from
loading anything from /data. If we don't do this they will need to
be extracted which is not favorable for RAM usage or performance.

Test: make and flash and look at system server maps
Bug: 65122284
Bug: 62356545

(cherry picked from commit 418258cee9)

Merged-In: I2e70c80a86327b455450b95144f21020e7bf0c6f
Change-Id: I316e79c7c6d45e2ccbfff4065137cc3ef9d2738e
2017-10-12 20:40:41 +00:00
Jiyong Park bc8a222efe Merge "Don't reserve size for bad blocks when checking image size"
am: dd68a6cb74

Change-Id: Ibea8f1f19b6ec4a3cf1969dde726a90265439128
2017-10-06 19:55:45 +00:00
Treehugger Robot dd68a6cb74 Merge "Don't reserve size for bad blocks when checking image size" 2017-10-06 19:40:29 +00:00
Jeff Vander Stoep 3f91e931c2 Merge "sepolicy: add owners file" am: 750b8e84c1 am: 8bd17a1df4 am: c4e07ce19b
am: 222a2e511b

Change-Id: I03309353879eb31a451ab3e2a9aee205ab58ac79
2017-10-06 04:43:44 +00:00
Jeff Vander Stoep 222a2e511b Merge "sepolicy: add owners file" am: 750b8e84c1 am: 8bd17a1df4
am: c4e07ce19b

Change-Id: Icf67bc129db832b7d4c88bd7646597adfdc4e250
2017-10-06 04:37:54 +00:00