Commit Graph

153 Commits

Author SHA1 Message Date
Yifan Hong d9842ea1c9 Add device/fwk compatibility matrices to device.
am: b5cbe22b84

Change-Id: I739579f918fe233e153a6ef1dbce77f5863dd808
2017-05-02 07:42:41 +00:00
Yifan Hong b5cbe22b84 Add device/fwk compatibility matrices to device.
Also renamed matrix.xml to compatibility_matrix.xml.

Test: make and ensure vendor/compatibility_matrix.xml is there.
Test: adb shell vintf (see matrices, compatible = true)

Bug: 37321309
Change-Id: I4ebbedf47a576a50a42df53b72e507ed31ef2e56
2017-05-01 21:49:18 -07:00
Yifan Hong 9c20c473ef Merge changes from topic 'assemble_vintf' into oc-dev
am: ffd66c35bf

Change-Id: I73f8430739e3d129716c3569c000433786099bf1
2017-04-15 01:31:39 +00:00
Yifan Hong aa21221f80 Use assemble_vintf to verify framework manifests.
Test: builds, and verify that system/manifest.xml is there.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: Ic3bb50211311fa423a2ad56bd2891cb57d7dc1a5
2017-04-14 16:29:55 -07:00
Michael Schwartz b4baff4961 Merge "Rule to copy device manifest to device" into oc-dev
am: ceeaa7be20

Change-Id: Ibd3b2ffbc591e22682539e2cdb49b0b622549f54
2017-04-14 03:41:01 +00:00
Michael Schwartz ceeaa7be20 Merge "Rule to copy device manifest to device" into oc-dev 2017-04-14 03:25:55 +00:00
Michael Schwartz 4d9cb56866 Rule to copy device manifest to device
The device manifest defines the collection of HAL interfaces exposed by
the vendor. Create a common rule so each target need not define their own.

Bug: 36810913
Test: Ran marlin build and inspected file was copied
Change-Id: I9f53796fdd85e706f91664d275aff6dbd785213f
2017-04-13 08:42:42 -07:00
Martijn Coenen d997015f4b Merge "Add hwservice_contexts to default builds." into oc-dev
am: 14d363fa42

Change-Id: Ibe4ad09dfa98fa438eeb840845cf32216ecd103b
2017-04-13 03:43:42 +00:00
Martijn Coenen bcd029c587 Add hwservice_contexts to default builds.
Bug: 34454312
Test: marlin boots
Change-Id: Ifff8c2842b4131dba6a480c87c6db1e65497e6ef
2017-04-12 12:43:26 -07:00
Martijn Coenen 01371056bb Add 'vndservice' to default builds.
am: 1fe4f23a04

Change-Id: Ib6015b8ce6abb634963e251aea825d660bf59968
2017-04-07 20:07:14 +00:00
Martijn Coenen 1fe4f23a04 Add 'vndservice' to default builds.
To query vndservicemanager and its services.

Bug: 36987120
Test: vndservice present and works
Change-Id: Ic65acbde17a1be5b728eeeac0f799a86c1d8c1fa
2017-04-07 10:49:22 -07:00
Martijn Coenen 31ee76a1e0 Merge "Add vndservicemanager to default builds." into oc-dev
am: a4f90284c7

Change-Id: I13148e6efb9f7ecb57c95000b69392d6ec69b65f
2017-04-05 15:59:06 +00:00
Martijn Coenen ca1fd78190 Add vndservicemanager to default builds.
vndservicemanager will be used for AIDL/binder
communication between processes running from
the /vendor partition. While technically only
required on full-treble devices, it is useful
to have on Android devices by default, since it
allows vendors to distribute a single binary talking
to vndservicemanager, instead of having to maintain
two versions that talk to different servicemanagers.

On devices that don't have a new kernel prebuilt with
/dev/vndbinder yet, vndservicemanager will simply
block indefinitely.

Also add new vndservice_contexts target, that
defines the service contexts for vendor services.

Bug: 36052864
Test: Marlin boots with and without /dev/vndbinder
Change-Id: I7334b5cb357dc6d4c5de8632e835dd892cd2f174
2017-04-04 14:06:04 -07:00
Elliott Hughes d36d82a117 resolve merge conflicts of 7206a3b38c to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00dfc08b1ca7223d49b18fceab780c5dbec0d7e
2017-04-03 10:48:05 -07:00
Elliott Hughes c86ea11fe9 Switch to a shell_and_utilities phony module.
(cherrypick of cb7d59687483c9532beecde60fe96053eda76948.)

Bug: N/A
Test: builds
Change-Id: I6416d9dded4cc225f57f0a521cf6114f39203ece
2017-04-03 17:13:58 +00:00
Jeff Vander Stoep b8093c0e87 Merge "embedded.mk: Make phony selinux_policy" am: b30c12df3e am: 6d418a86b7
am: 856b00b8db

Change-Id: Ib3fc261851e1a19eea91513f0ea2fbe3dde5ba1c
2017-03-27 20:12:11 +00:00
Jeff Vander Stoep 2064364765 embedded.mk: Make phony selinux_policy
Moves selinux policy build decisions to system/sepolicy/Android.mk.
This is done because the PRODUCT_FULL_TREBLE variable isn't available
in embedded.mk and TARGET_SANITIZE isn't available to dependencies of
init.

Test: Build/boot Bullhead PRODUCT_FULL_TREBLE=false
Test: Build/boot Marlin PRODUCT_FULL_TREBLE=true
Test: Build Marlin TARGET_SANITIZE=address. Verify asan rules are
      included in policy output.

Bug: 36138508
Change-Id: I792786cd867bae3e1baeb824167a848948a719df
2017-03-26 14:51:38 -07:00
Jaesoo Lee 58f8dfa5a6 Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES" am: 946af3fa5d am: 3973c2af63
am: 9c41aa58eb

Change-Id: Ic2a10e7fe09eec97680619779b65fb36ede00758
2017-03-22 01:07:50 +00:00
Jaesoo Lee a1d99c1351 removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES
This change removes the passthough mode implemention of Configstore.

Bug: 35325577
Test: android.hardware.configstore@1.0-impl.so not exist in outputs and
    Configstore works in binderized mode

Change-Id: Ie9ec24c33701356b7fa8c4f6cfc372c09051f62c
Merged-In: Ic16d5ebe30fabfd62ba4e444fe2775ddfbe2a18a
2017-03-21 11:01:53 +09:00
Alex Klyubin 71d223b8c3 Merge "Remove unused /selinux_version" am: f32107fbb2 am: ac5ac23bb3
am: 561e101ec9

Change-Id: I25fed6576441cbd329bb0228ff47c625172c8444
2017-03-15 20:15:42 +00:00
Alex Klyubin 4fe461d2a0 Remove unused /selinux_version
This file is no longer needed because it was needed for supporting
reloadable/dynamic SELinux policy which is no longer supported.

Test: Clean build, flash, device boots without additional denials.
      Reboot to recovery works, no additional denials.
Bug: 33642277
Change-Id: Ie65e74b8c8437694bc1ea019ab844f60f9e89ade
2017-03-15 09:47:36 -07:00
Jaesoo Lee 2b61f19254 Merge "configstore: add default implementation of configstore@1.0 HAL" 2017-03-14 06:44:13 +00:00
Jeff Vander Stoep 4d9e183836 Merge "Include file_contexts conditionally elsewhere" am: e65af5ce72 am: 10539b3253
am: 96377665f2

Change-Id: Ib46554b2ebccd930a4b2a827c7fdd8a9ff0f15db
2017-03-11 00:06:42 +00:00
Jiyong Park 4ed780c454 configstore: add default implementation of configstore@1.0 HAL
This change adds default implementation of configstore@1.0 HAL to all
embedded devices.

Bug: 34314793
Test: build. make sure /system/bin/hw has file
android.hardware.configstore@1.0-service

cherry-picked
1d6ab958c configstore: add default implementation of configstore@1.0 HAL

Merged-in: I65f416560de9d65c57e6cfcb9a6fe26b0140d4a6
Change-Id: Ib68fa325a0f0ce60db0701e16a5a9056411fb398
2017-03-10 10:13:17 +09:00
Jeff Vander Stoep f57a154f2e Include file_contexts conditionally elsewhere
Test: Marlin and Bullhead build and boot with no new denials.
Test: Marlin and Bullhead recovery boots with no new denials.
Test: Bullhead boots with file_contexts.bin in /
Test: Marlin boot with /system/etc/selinux/plat_file_contexts and
      /vendor/etc/selinux/nonplat_file_contexts.
Bug: 36002414

Change-Id: I25af653e060c0c72ea6ad08db8869132885adff8
2017-03-08 21:12:47 -08:00
Alex Klyubin 5a8d726ced Merge "Include secilc and sepolicy conditionally, elsewhere" am: 3e78704825 am: 8fe478de64
am: d485d2a10c

Change-Id: Ic2da20423482bb5d8aff2d61a29044a547c42753
2017-03-03 04:02:10 +00:00
Alex Klyubin 8e87853a04 Include secilc and sepolicy conditionally, elsewhere
This removes the unconditional inclusion of secilc and sepolicy.
These artefacts are now conditionally included by system/core/init.
The reason for declaring the conditional inclusion there is because
the desired conditional inclusion based on PRODUCT_FULL_TREBLE cannot
be declared here because PRODUCT_FULL_TREBLE is not yet available when
this file is interpreted.

Test: Device boots, no additional SELinux denials. This test is
      performed on a device with PRODUCT_FULL_TREBLE set to true, and
      on a device with PRODUCT_FULL_TREBLE set to false.
Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and
      the three *.cil files, but does not contain the sepolicy file.
      Device with PRODUCT_FULL_TREBLE set to false contains sepolicy
      file but does not contain the secilc file or any *.cil files.
Bug: 31363362

Change-Id: Ia3f38948b71a054918f5f63c594ba62a033e1066
2017-03-02 12:58:38 -08:00
Yifan Hong 8c86bc72b4 Merge "sintf.xml => manifest.xml" am: aeec3bfde7 am: 28070816fb
am: 1b510a9705

Change-Id: I6fb3f8c4f44d4f3fe68a915b1a6f85fc7db5c107
2017-03-02 03:55:56 +00:00
Yifan Hong c3373a32e4 sintf.xml => manifest.xml
Bug: 35870239
Test: make -j64 and ensure manifest.xml is there.
Change-Id: I5eccc6dcdc04a3caadc3ccce1d8b58c12f5950ee
2017-03-01 18:09:28 -08:00
Yifan Hong b5d70b3a77 Merge "Add system/manifest.xml on device" am: 569cb34dc0 am: 40517f3ea3
am: 65460a8fb9

Change-Id: I1943a06d7480363df5352d0fe88cdc6a69825153
2017-03-01 03:02:26 +00:00
Treehugger Robot 569cb34dc0 Merge "Add system/manifest.xml on device" 2017-03-01 02:54:52 +00:00
Yifan Hong 7ebc342b86 Add system/manifest.xml on device
Similar to vendor/manifest.xml on device, this file lists
all HALs defined in the framework (and hence go
to the system image). IServiceManager / IMemory /
etc. getService should consult this file (via VINTF
object under /system/libvintf) to return the HAL in the correct
transport mode.

Bug: 34772739 Create system/manifest.xml
Bug: 35219444 Need interface + instance entry

Test: compiles and manually confirm that system/manifest.xml exist.
Change-Id: I5b3c79b068841e47062cbab6f72d70555801a21d
2017-02-28 16:13:42 -08:00
Alex Klyubin c3a1650f6c Merge "Make secilc available" am: bbdd0e8745 am: 22bcc5db9d
am: b5846d8453

Change-Id: Ib805383037565df6a403a1725da1b34d10d432ef
2017-02-27 23:27:48 +00:00
Alex Klyubin 46dd574918 Make secilc available
The SELinux policy compiler needs to be available on-device to compile
SELinux policy at boot on some devices. For now, we're including this
unconditionally, but, going forward, we will include this binary only
on devices which need it.

Test: Device boots -- secilc is not yet used anyway
Bug: 31363362
Change-Id: I7712b70d7c5b4c57bec2cdb44519b42d26758d09
2017-02-27 13:28:42 -08:00
Steven Moreland f086747106 embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.

Bug: 35327976
Test: hidl_test, device boots with allocator

Merged-In: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
2017-02-17 20:47:16 +00:00
Steven Moreland 69249f1f53 embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.

Bug: 35327976
Test: hidl_test, device boots with allocator
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
2017-02-17 12:36:54 -08:00
Jiyong Park 6a220471eb Merge "configstore: add default implementation of configstore@1.0 HAL" 2017-02-01 04:23:12 +00:00
Sandeep Patil d79c65f085 SELinux: split property_contexts into platform and non-platform components. am: b0481560e4 am: e0ccdc0e42 am: ba742d7dde
am: fac4996610

Change-Id: I14d2d100c3b6e3970fd3852b5d9fd0a88895e151
2017-01-30 19:32:41 +00:00
Sandeep Patil b0481560e4 SELinux: split property_contexts into platform and non-platform components.
Bug: 33746484
Test: Successfully boot with original service and property contexts.
      Successfully boot with split serivce and property contexts.

Change-Id: I1932684f600dd34d5136e72ac053fae13f0c3eba
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-26 15:30:31 -08:00
Yifan Hong 74fb50800c Merge "Add lshal to embedded.mk." am: cbc8f16656 am: 1a375ded9a am: 1030be9543
am: 21a7e626f2

Change-Id: I930f8a5cccc341178e0d25c1c8599753bb7a4e47
2017-01-26 18:32:15 +00:00
Yifan Hong 7dbae043ff Add lshal to embedded.mk.
Test: make -j64 and flash the device and
ensure that lshal is available on the device.

Bug: 34712252
Change-Id: If61047afb27f9da9f8825ce18e2dfc0b3dec10e2
2017-01-26 18:17:36 +00:00
Jiyong Park 1d6ab958ca configstore: add default implementation of configstore@1.0 HAL
This change adds default implementation of configstore@1.0 HAL to all
embedded devices.

Bug: 34314793
Test: build. make sure /system/bin/hw has file
android.hardware.configstore@1.0-service

Change-Id: I65f416560de9d65c57e6cfcb9a6fe26b0140d4a6
2017-01-24 12:50:53 +09:00
Josh Gao 748cc8640a Merge "Add crash_dump and tombstoned products." am: 6651199eeb am: 7cf55a4581 am: 1df77bc0c7
am: 85d13bcb8e

Change-Id: Ifffa02acab8d00a6d400c78ef27e0583f36b80ea
2017-01-19 00:41:16 +00:00
Josh Gao 6651199eeb Merge "Add crash_dump and tombstoned products." 2017-01-18 23:04:09 +00:00
Jorim Jaggi 8cbd925748 Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit c5ffdd4bb4.

Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
2017-01-18 15:37:30 +00:00
Jorim Jaggi 84fcd62cb4 Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit c5ffdd4bb4.
2017-01-18 16:28:54 +01:00
Sandeep Patil 3d425305ee SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4 am: a94ae916ce am: eec071a34a
am: 8a3f41af27

Change-Id: I7d859256d4e0b3fed0a58932d5ddc9498a69c1eb
2017-01-18 06:27:05 +00:00
Sandeep Patil 1b8d3bc0e2 SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63 am: 0068df10f6 am: 29c9cb811d
am: d091ce20b1

Change-Id: I3331c1b48a75374f675d8527255d3d28ed3251bd
2017-01-18 00:55:09 +00:00
Sandeep Patil c5ffdd4bb4 SELinux: split property_contexts into platform and non-platform components.
Bug: 33746484
Test: Successfully boot with original service and property contexts.
      Successfully boot with split serivce and property contexts.

Change-Id: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-18 00:41:15 +00:00
Josh Gao e6b2ddaf69 Add crash_dump and tombstoned products.
Bug: http://b/30705528
Change-Id: I3f6c98f6f907f93e082db085a122557fc8488c83
2017-01-17 13:55:18 -08:00