Commit graph

1865 commits

Author SHA1 Message Date
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
Jeff Vander Stoep
10539b3253 Merge "Include file_contexts conditionally elsewhere"
am: e65af5ce72

Change-Id: Ib781e0237f2bd68431d50890b9d9beaeff86bf74
2017-03-10 23:59:39 +00: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
bohu
7154859047 Emulator: enable GPS hidl service and impl
BUG: 36052760
Change-Id: I3fa3b6bd11e5791f284676fa82b3106725aaaa17
2017-03-08 16:27:56 -08:00
bohu
318905fff4 Emulator: Enable sensors hal support for hidl passthrough mode.
BUG: 35990227
Change-Id: Ia534f87727d59e5497ce46ed413aff739e5cf701
2017-03-07 00:18:28 +00: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
8fe478de64 Merge "Include secilc and sepolicy conditionally, elsewhere"
am: 3e78704825

Change-Id: I00b1084eca64b0c42ea4f814f75a9e1f53a87879
2017-03-03 03:55:46 +00:00
Treehugger Robot
3e78704825 Merge "Include secilc and sepolicy conditionally, elsewhere" 2017-03-03 03:50:48 +00:00
Calin Juravle
a5ab384e1c Merge "Enable secondary dex compilation in the background dexopt job"
am: 34200a1ad1

Change-Id: I6414d7e0a2a2bc783e85094f9cb11fe0290ac0e4
2017-03-02 23:58:24 +00:00
Calin Juravle
34200a1ad1 Merge "Enable secondary dex compilation in the background dexopt job" 2017-03-02 23:54:24 +00:00
Calin Juravle
148d23106b Enable secondary dex compilation in the background dexopt job
Test: adb shell cmd package bg-dexopt-job
Bug: 32871170

(cherry picked from commit dc308c1b1d)

Change-Id: I21664d5e11dada868dab502498b7c5e598852289

Merged-In: I473e291a26335bd766c8845d2ea28c4f1e45db53
2017-03-02 13:04:17 -08: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
28070816fb Merge "sintf.xml => manifest.xml"
am: aeec3bfde7

Change-Id: Ice2fd7685dc57f05b3911d5b74a922d2731c8669
2017-03-02 03:46:30 +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
Philip P. Moltmann
46c821d577 Merge "Ship BuiltInPrintService in default repo" am: 779ba5e692 am: d73c40d73c
am: 7d91f81dfb

Change-Id: I7f88828e279abf0cdf154dbeefc4a48359646886
2017-03-01 19:35:53 +00:00
Philip P. Moltmann
d73c40d73c Merge "Ship BuiltInPrintService in default repo"
am: 779ba5e692

Change-Id: Iee8e4c9a0b7ebd555c94865e8781fbd1a996e56c
2017-03-01 19:30:52 +00:00
Philip P. Moltmann
779ba5e692 Merge "Ship BuiltInPrintService in default repo" 2017-03-01 19:21:48 +00: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
Yifan Hong
40517f3ea3 Merge "Add system/manifest.xml on device"
am: 569cb34dc0

Change-Id: Id838f4f9f25694c6347c35ca6470ff781fa7db42
2017-03-01 02:57:58 +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
22bcc5db9d Merge "Make secilc available"
am: bbdd0e8745

Change-Id: I6ce67f392ab6523f2ac96e4f32e37a93e9272095
2017-02-27 23:23:57 +00:00
Philip P. Moltmann
fa064b30ef Ship BuiltInPrintService in default repo
Bug: 31992514
Test: Built
Change-Id: I074a14ea9141866dffe9dfa128f18927230314c7
2017-02-27 14:55:35 -08: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
Colin Cross
9a02b183fd Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 557ce055e7

Change-Id: I559d7aa1a6f6bf65da33327c9a900b08c78869e0
2017-02-21 23:31:31 +00:00
Colin Cross
557ce055e7 Merge "Revert "Replace hardware features conf file to be emulator specific"" 2017-02-21 23:25:07 +00:00
Colin Cross
0c59db87be Revert "Replace hardware features conf file to be emulator specific"
This reverts commit a118a21b00.

Change-Id: I2c4140667a2c00abad3c6337c680542070dd7caa
2017-02-18 13:36:18 -08:00
Colin Cross
efa6ae84ca Revert "Replace hardware features conf file to be emulator specific"
This reverts commit a118a21b00.

Change-Id: I2c4140667a2c00abad3c6337c680542070dd7caa
2017-02-18 20:05:24 +00:00
Pulkit Bhuwalka
23575449a8 Merge "Replace hardware features conf file to be emulator specific" am: afd7f4f453 am: 7be6f4c9fd
am: 7072f50067

Change-Id: I471cae79973e6a0cb13d6c2b2c6eb5de1c23fd74
2017-02-18 06:21:23 +00:00
Steven Moreland
dc7d29ed86 Merge "embedded.mk: allocator service"
am: 0aef0b59af

Change-Id: I1e76d88e7d79082006bc4671087987e7d0df2966
2017-02-18 01:52:57 +00:00
Treehugger Robot
0aef0b59af Merge "embedded.mk: allocator service" 2017-02-18 01:49:07 +00:00
Pulkit Bhuwalka
7be6f4c9fd Merge "Replace hardware features conf file to be emulator specific"
am: afd7f4f453

Change-Id: I52b0bc325e8fb8d72e40d947cd7e683ab415d10c
2017-02-17 23:28:19 +00:00
Pulkit Bhuwalka
a118a21b00 Replace hardware features conf file to be emulator specific
full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.

Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.

Bug: 35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.

Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768
2017-02-17 13:46:01 -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
Phil Burk
80f830969c Merge "libaaudio: changed name from liboboe" 2017-02-10 21:41:14 +00:00
Eugene Susla
e7215aa2d2 Merge "Include CompanionDeviceManager in build/make/target/product/core.mk" 2017-02-10 20:29:28 +00:00
Phil Burk
85417bcd73 libaaudio: changed name from liboboe
Bug: 34749573
Test: CTS test_aaudio.cpp
Change-Id: Id4a817eaff1655aa0d213c4b678de166fa322ecd
Signed-off-by: Phil Burk <philburk@google.com>
2017-02-10 17:28:52 +00:00
Calin Juravle
dc308c1b1d Enable secondary dex compilation in the background dexopt job
Test: adb shell cmd package bg-dexopt-job
Bug: 32871170
Change-Id: I473e291a26335bd766c8845d2ea28c4f1e45db53
2017-02-07 10:25:21 -08:00
Eugene Susla
2e83763928 Include CompanionDeviceManager in build/make/target/product/core.mk
Test: ensure there's no build error
Change-Id: I731543b8ac1fffcb191a2fc8a706b719df3c5b07
2017-02-06 16:11:30 -08:00
Jim Kaye
7cf8429738 Merge "[Emulator] Include the "Cell Broadcast Receiver" app" 2017-02-06 19:31:37 +00: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
ba742d7dde SELinux: split property_contexts into platform and non-platform components. am: b0481560e4
am: e0ccdc0e42

Change-Id: I1abe5be8c7c0d6db35a9039954be8f89aa660669
2017-01-30 19:25:14 +00:00
Eino-Ville Talvala
3665e64109 Emulator builds: Disable camera service Treble mode for now
Until all backwards-compatibility support is in place, the emulator
targets need to not use the Treble path.

Bug: 32991422
Bug: 32989965
Test: Built aosp_x86_64-eng and verified build.prop has the new key
Change-Id: I72487126b0ec7c7794bb3f57f4b1a649a2ec140b
2017-01-26 16:21:38 -08: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
1030be9543 Merge "Add lshal to embedded.mk." am: cbc8f16656
am: 1a375ded9a

Change-Id: Ie627b77505bfcd27ec2a08e847f58b5a13b2de7f
2017-01-26 18:25:44 +00:00