Commit graph

43232 commits

Author SHA1 Message Date
Christopher Ferris
6d7bae1ade Merge "Move to new isolation test runner."
am: 4755a06956

Change-Id: Iea4286be6e623807c72b715030cf24a02f1017ed
2018-10-01 16:37:39 -07:00
Christopher Ferris
4755a06956 Merge "Move to new isolation test runner." 2018-10-01 23:07:31 +00:00
Dan Willemsen
b12b3393f8 Merge "Match src paths with aidl package name"
am: 9af3b16c72

Change-Id: I4dee345441d29f050d325cf23e67a5d254c25e31
2018-09-29 15:03:48 -07:00
Treehugger Robot
9af3b16c72 Merge "Match src paths with aidl package name" 2018-09-29 21:48:29 +00:00
Hridya Valsaraju
e83c49def4 Merge "Add support to read fastboot variable 'off-mode-charge'"
am: e15267b5d1

Change-Id: I7334f80c14e77a8ab8abca7d093f602fd6f12ff6
2018-09-28 16:12:00 -07:00
Treehugger Robot
e15267b5d1 Merge "Add support to read fastboot variable 'off-mode-charge'" 2018-09-28 22:45:40 +00:00
Hridya Valsaraju
7c9bbe948b Add support to read fastboot variable 'off-mode-charge'
Bug: 78793464
Bug: 79480454

Test: fastboot getvar off-mode-charge
Change-Id: I4c40847be292e8e2e420340f81bb624b247bc11b
Merged-In: I4c40847be292e8e2e420340f81bb624b247bc11b
(cherry picked from commit b05d278696)
2018-09-28 14:16:47 -07:00
Hridya Valsaraju
f9568659b0 Merge "Support fastboot variable 'variant'."
am: 007e52efe0

Change-Id: I4279b0da700b1595e67b2ed95a66eca9e8018e26
2018-09-28 13:31:37 -07:00
Treehugger Robot
007e52efe0 Merge "Support fastboot variable 'variant'." 2018-09-28 20:15:46 +00:00
Hridya Valsaraju
4af80901a6 Support fastboot variable 'variant'.
Bug: 79480454
Bug: 78793464
Test: fastboot getvar variant
Change-Id: Iefef82c147d8405318c793ad0a73f00674bbb63d
Merged-In: Iefef82c147d8405318c793ad0a73f00674bbb63d
(cherry picked from commit 4785287a00)
2018-09-28 11:38:58 -07:00
Michael Ryleev
512f751fd5 Merge "trusty: keymaster3: Modify TrustyKeymaster3Device::update method"
am: bd9751a387

Change-Id: Idc19ec446ac917d9ade0fa663b53c0cb8aaf70ec
2018-09-28 11:38:49 -07:00
Treehugger Robot
bd9751a387 Merge "trusty: keymaster3: Modify TrustyKeymaster3Device::update method" 2018-09-28 18:21:50 +00:00
Mark Salyzyn
6d3d70f405 Merge "fs_mgr: overlayfs increase logging signal to noise ratio"
am: 49163e96a1

Change-Id: I3d20a4f2b8cacc35b6f165d0342c59ff01351f54
2018-09-28 07:31:03 -07:00
Mark Salyzyn
e9643eb901 Merge changes I156bfefd,I14b0b7e8
am: 455364c6cb

Change-Id: I36d6325403f82451aeeab22c371334bbef8cb87b
2018-09-28 07:30:09 -07:00
Mark Salyzyn
49163e96a1 Merge "fs_mgr: overlayfs increase logging signal to noise ratio" 2018-09-28 14:17:08 +00:00
Treehugger Robot
455364c6cb Merge changes I156bfefd,I14b0b7e8
* changes:
  bootstat: smpl -> reboot,powerloss
  bootstat: uvlo -> reboot,undervoltage
2018-09-28 14:14:32 +00:00
Remi NGUYEN VAN
cc2e1fc2e8 Merge "Revert "Add static libbinderthreadstate explicitly to charger module.""
am: f41dc66201

Change-Id: I4154322e2877ae7b95e8ada87a9ef202b54b3f9f
2018-09-28 03:01:04 -07:00
Remi NGUYEN VAN
f41dc66201 Merge "Revert "Add static libbinderthreadstate explicitly to charger module."" 2018-09-28 09:42:54 +00:00
Remi NGUYEN VAN
17a65497bb Revert "Add static libbinderthreadstate explicitly to charger module."
This reverts commit f23fa3b12f.

Reason for revert: This breaks framework tests and blocks presubmit

Change-Id: Iccf29d7499c378c611ea5a783074865febf8514e
2018-09-28 07:50:18 +00:00
Christopher Ferris
805ea83840 Move to new isolation test runner.
Test: Ran tests.
Change-Id: I1c226111d4667daded90320e1d2b944c5566d34f
2018-09-27 22:23:17 -07:00
Jayant Chowdhary
0a802dc2f5 Merge "Add static libbinderthreadstate explicitly to charger module."
am: 87b6cb497b

Change-Id: I323557ec0d186be04eb1ec489f6ee2028848f299
2018-09-27 14:15:55 -07:00
Jayant Chowdhary
87b6cb497b Merge "Add static libbinderthreadstate explicitly to charger module." 2018-09-27 21:02:36 +00:00
Jayant Chowdhary
f23fa3b12f Add static libbinderthreadstate explicitly to charger module.
Bug: 110364143

Bug: 114311116

Test: Builds

Change-Id: I367cab4f6113d72bbaf1c9a41099110124916f57
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-09-27 10:36:13 -07:00
Tao Bao
7af8817bf3 Merge "Revert "Revert "mkbootimg: Build mkbootimg with Soong."""
am: 5b1111c074

Change-Id: Ia2dfe7e0858b310081a608662986135043fda22b
2018-09-27 10:01:11 -07:00
Treehugger Robot
5b1111c074 Merge "Revert "Revert "mkbootimg: Build mkbootimg with Soong.""" 2018-09-27 16:37:01 +00:00
Pirama Arumuga Nainar
d53ea9b113 Merge "Enable -Wexit-time-destructor for all targets"
am: 07adf8b856

Change-Id: Ifc5c85acfedff60497e3f3d91032a1e0dbc73a8c
2018-09-27 08:52:04 -07:00
Treehugger Robot
07adf8b856 Merge "Enable -Wexit-time-destructor for all targets" 2018-09-27 15:39:25 +00:00
Tao Bao
0e5e816185 Revert "Revert "mkbootimg: Build mkbootimg with Soong.""
This reverts commit 55a78bf580.

There's no change in this CL from the initial landing. The earlier crash
was caused by manifest setup in build-tools and clang-tools branches,
which has been addressed by the following CLs.
https://android-review.googlesource.com/c/platform/manifest/+/769045
https://android-review.googlesource.com/c/platform/manifest/+/769044

Bug: 116698229
Change-Id: I33701c9f77e814257cc5c65ad7aa587835ae00ad
Test: TreeHugger
2018-09-27 14:11:51 +00:00
Pirama Arumuga Nainar
ca6ee8331f Enable -Wexit-time-destructor for all targets
This warning should be available for Windows as well.

Test: mmma system/core/base
Change-Id: Id2e7e4da2e5105870a8d1e10c793e4a54c5b3d04
2018-09-26 23:31:00 -07:00
Pirama Arumuga Nainar
e06ca15fd2 Merge "Do not construct std::function with Allocator argument"
am: 9c5c396d11

Change-Id: I889f3c16e960c5d8b98550c45f00f95c8aef4410
2018-09-26 21:20:49 -07:00
Treehugger Robot
9c5c396d11 Merge "Do not construct std::function with Allocator argument" 2018-09-27 01:43:39 +00:00
Tom Cherry
928416f2d5 Merge "init: use '/system' as the system mount point for force_normal_boot"
am: e3745bc57a

Change-Id: If8fecdd155c28fb8738756ad51cd131f0c62d4de
2018-09-26 17:54:36 -07:00
Josh Gao
9923935af4 Merge changes I6a14ac96,I996b9885
am: 4b187d2bc9

Change-Id: I2db69305871078ec4a3ac185063f79a505190a76
2018-09-26 17:53:59 -07:00
Tom Cherry
e3745bc57a Merge "init: use '/system' as the system mount point for force_normal_boot" 2018-09-27 00:35:22 +00:00
Treehugger Robot
4b187d2bc9 Merge changes I6a14ac96,I996b9885
* changes:
  adb: add fdevent_release.
  adb: fix test_device.FileOperationsTest.test_push_empty.
2018-09-27 00:30:30 +00:00
Mark Salyzyn
03df4238f6 fs_mgr: overlayfs increase logging signal to noise ratio
Remove unnecessary content from logging.  PERROR implies failure,
and logging reports source, so no need to fortify.

Test: compile
Bug: 109821005
Change-Id: Ie25de6ec35dd1890e9a14ecee96956e743a2a91c
2018-09-26 16:08:09 -07:00
Tom Cherry
c382957789 init: use '/system' as the system mount point for force_normal_boot
We need to keep the right mount points in the fstab for other
processes to access (/ for system-as-root or /system otherwise).
Force_normal_boot devices are defacto not system-as-root,
since they're booting through the recovery ramdisk and therefore must
use /system as the system mount point.

Bug: 114062208
Test: boot pixel from recovery with force_normal_boot
Change-Id: Ib0e4e4f8a29299ecdcd35e8f1415551c4c9745ad
2018-09-26 13:27:16 -07:00
Pirama Arumuga Nainar
02ab36e220 Do not construct std::function with Allocator argument
Bug: http://b/116702964

This breaks when built with C++17, where these constructors are removed.
Looks like libc++ ignored the allocator arguments anyway - so this
should be NFC even with C++17.

Test: memunreachable_test on the host and Sailfish with C++14, C++17
Change-Id: I638326a900781f64d0562b5ec38e990659967039
2018-09-26 20:24:13 +00:00
Mark Salyzyn
f62983a646 bootstat: smpl -> reboot,powerloss
smpl anywhere in boot loader reason string will match and convert to
reboot,powerloss when propagated to system boot reason.

Test: compile
Bug: 63736262
Change-Id: I156bfefd05d2bab480408cf6bb1dc4c61c8983f9
2018-09-26 13:02:16 -07:00
Mark Salyzyn
ec7bafee94 bootstat: uvlo -> reboot,undervoltage
uvlo anywhere in boot loader reason string will match and convert to
reboot,undervoltage when propagated to system boot reason.

Test: compile
Bug: 63736262
Change-Id: I14b0b7e8185aa4fb519efdb6cb1306718e9de69c
2018-09-26 13:02:16 -07:00
Josh Gao
e5c0b960cd Merge "adb: make test_device.py executable."
am: db8b2afe23

Change-Id: I48e820bced3c5c3953d6fbcd2569bfee22bda833
2018-09-26 12:59:03 -07:00
Josh Gao
2f6c2fa935 adb: add fdevent_release.
Implement a version of fdevent_destroy that returns the file descriptor
previously owned by the fdevent, instead of closing it.

Bug: http://b/74616284
Test: treehugger
Change-Id: I6a14ac96e6b8c801bc71bfcc9094851c158510ae
2018-09-26 12:44:30 -07:00
Josh Gao
ed17650438 adb: fix test_device.FileOperationsTest.test_push_empty.
It was doing a test with `[ -d foo`, without the closing square bracket.

Test: python -m unittest test_device.FileOperationsTest.test_push_empty
Change-Id: I996b98850cf916986ef969768a7235547fcc404a
2018-09-26 12:44:30 -07:00
Josh Gao
db8b2afe23 Merge "adb: make test_device.py executable." 2018-09-26 19:43:28 +00:00
Hridya Valsaraju
f8fb6d053d Merge "Support 'fastboot getvar unlocked' command."
am: e4931c5bd4

Change-Id: Ie0bf43645d24c91274de50bd1729a37969d568c9
2018-09-26 09:35:25 -07:00
Treehugger Robot
e4931c5bd4 Merge "Support 'fastboot getvar unlocked' command." 2018-09-26 16:21:28 +00:00
Tao Bao
d8768f9e53 Merge "Revert "mkbootimg: Build mkbootimg with Soong.""
am: 6cc0d76d83

Change-Id: Ic61c44bcc68bd0cec21180ef3343b993107827cc
2018-09-26 08:26:03 -07:00
Tao Bao
5acee525d2 Merge "mkbootimg: Build mkbootimg with Soong."
am: 0baf7f7250

Change-Id: I42da3d2cb0ea8e7841ea372c1f62ed60d7d20c0f
2018-09-26 08:21:07 -07:00
Tao Bao
6cc0d76d83 Merge "Revert "mkbootimg: Build mkbootimg with Soong."" 2018-09-26 15:20:50 +00:00
Tao Bao
55a78bf580 Revert "mkbootimg: Build mkbootimg with Soong."
This reverts commit 51360fc349.

Reason for revert: Triggered some crash in Soong.

Bug: 116698229
Change-Id: Iab4827fdadc65cbabb60aa07eeac7b33acea68a0
2018-09-26 15:19:24 +00:00