Commit Graph

2397 Commits

Author SHA1 Message Date
doheon1.lee 8250dc4837 Added make files for variable Nougat MR1
Nougat MR1 has different API LEVEL from previous releases,
PRODUCT_SHIPPING_API_LEVEL should be set to 25.

Change-Id: Ib3679bba4105dc99b96224c5f5554c1f0e4ab127
2017-04-05 19:45:50 +00:00
Elliott Hughes b7b29357ae Merge "Switch to a shell_and_utilities phony module."
am: cdcc4c52aa

Change-Id: Idb8a4ce418a64ac8691df9d1890d60f32102c1cc
2017-04-03 17:19:35 +00: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 6d418a86b7 Merge "embedded.mk: Make phony selinux_policy"
am: b30c12df3e

Change-Id: Iba9b4c92d1772f50f77a112747b32d4c4290e363
2017-03-27 20:06:41 +00:00
Treehugger Robot b30c12df3e Merge "embedded.mk: Make phony selinux_policy" 2017-03-27 20:03:04 +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
Dimitry Ivanov 3fd5bf0f82 Merge "Add ld.config.txt to rootdir/etc"
am: 86559441a1

Change-Id: I35da84dceb546c04494e16106745b63cc80234b0
2017-03-25 05:21:15 +00:00
Treehugger Robot 86559441a1 Merge "Add ld.config.txt to rootdir/etc" 2017-03-25 05:17:32 +00:00
Jaesoo Lee 3973c2af63 Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES"
am: 946af3fa5d

Change-Id: I59d10ade7c801359365d847d6c433d719a4128c2
2017-03-22 01:04:26 +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
bohu 5c8080cc18 Merge "Emulator: Enable logcat -Q to run in emulator"
am: 406d3b6df1

Change-Id: I9f429980942e043ea874ad45bb88646d1c036f5b
2017-03-17 16:30:33 +00:00
bohu 8c3364bd59 Emulator: Enable logcat -Q to run in emulator
Create qemu_cmdline property and make sure logcat
can read it.

Change-Id: I83261a1ba29ecf9fd9b51a815425742177018c87
2017-03-15 22:27:08 -07:00
Dimitry Ivanov d994a73989 Add ld.config.txt to rootdir/etc
This file is used by linker to create custom namespace
configuration for binaries.

Bug: http://b/30706810
Test: m
Change-Id: Ifc4e43ed51c6906c75a7f0d9f00a816b5e16c4d8
2017-03-15 14:47:35 -07:00
Alex Klyubin ac5ac23bb3 Merge "Remove unused /selinux_version"
am: f32107fbb2

Change-Id: Iba4f3d7eca37bbf20d9527245baf44f32b67c07f
2017-03-15 20:05:15 +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 371f5d502c Merge "configstore: add default implementation of configstore@1.0 HAL"
am: 2b61f19254

Change-Id: Ie122892697d2073575fcbb7dae4ba9838778517e
2017-03-14 06:50:30 +00: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 10539b3253 Merge "Include file_contexts conditionally elsewhere"
am: e65af5ce72

Change-Id: Ib781e0237f2bd68431d50890b9d9beaeff86bf74
2017-03-10 23:59:39 +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 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 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 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 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 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 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
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
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
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 1030be9543 Merge "Add lshal to embedded.mk." am: cbc8f16656
am: 1a375ded9a

Change-Id: Ie627b77505bfcd27ec2a08e847f58b5a13b2de7f
2017-01-26 18:25:44 +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
Calin Juravle 79ff8975b6 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am: eddf3adec7
am: 9be4363048

Change-Id: I09bb657dfa3a3d5ca5a2410313ee061235f56c74
2017-01-24 22:21:28 +00:00
Calin Juravle eddf3adec7 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" 2017-01-24 22:14:11 +00:00