Commit Graph

40383 Commits

Author SHA1 Message Date
Elliott Hughes 1781459f96 Merge "OWNERS for system/core/mkbootimg." am: 77a61d3e6e
am: 4531d73c0a

Change-Id: I49354165f563628a41596df392c32ec5714efd11
2018-03-29 01:56:44 +00:00
Elliott Hughes 4531d73c0a Merge "OWNERS for system/core/mkbootimg."
am: 77a61d3e6e

Change-Id: I8950d17b8fef16ada60e279fb549cd50c71b13e5
2018-03-29 01:37:56 +00:00
Treehugger Robot 77a61d3e6e Merge "OWNERS for system/core/mkbootimg." 2018-03-29 00:46:36 +00:00
Hridya Valsaraju 7cc1d44b94 Merge changes from topic "recovery_dtbo" am: 3ac694632c
am: c9dffd158c

Change-Id: I67b8109939874babfb594071e3b268d0b7142e7b
2018-03-29 00:35:24 +00:00
Hridya Valsaraju 82be5dc7c6 Add a recovery DTBO section to boot image am: 147b355bb3
am: 86f4bafa5e

Change-Id: I8c0a7b66977c002987546d338046d2d32c57017d
2018-03-29 00:35:03 +00:00
Elliott Hughes 9087594a79 Merge "Add "require partition-exists=" support." am: 539f3ddff5
am: fea8b41aa1

Change-Id: I1a69d7c96f4b417a33d5e2d015595715401e7b14
2018-03-29 00:30:06 +00:00
Josh Gao d8ff614f69 Merge changes Iea2a3055,I6582cfc6 am: 45562bfb63
am: 54b603ee56

Change-Id: I7fd99aa08ac1911eba06255a77e693d76b3d06ee
2018-03-29 00:29:35 +00:00
Hridya Valsaraju c9dffd158c Merge changes from topic "recovery_dtbo"
am: 3ac694632c

Change-Id: I684c39d4381f93e5ae3df7af21a6a60c2899b15d
2018-03-29 00:29:29 +00:00
Hridya Valsaraju 86f4bafa5e Add a recovery DTBO section to boot image
am: 147b355bb3

Change-Id: I01cba4d0bdb21a533c5c76f9e71993c6f2f0f7cc
2018-03-29 00:29:01 +00:00
Elliott Hughes fea8b41aa1 Merge "Add "require partition-exists=" support."
am: 539f3ddff5

Change-Id: If07bf31027fab8c4b341c9bc6de907cff94e2c7f
2018-03-29 00:27:36 +00:00
Josh Gao 54b603ee56 Merge changes Iea2a3055,I6582cfc6
am: 45562bfb63

Change-Id: Ic1e986c5554bcb191b025afec41fc051f9714574
2018-03-29 00:27:09 +00:00
Christopher Ferris 6dbc28ece3 Fix null pointer dereference in RegsArm.
Fix RegsArm::GetPcAdjustment to check for an invalid elf before trying
to read memory.
Modify the tests for this so it crashes without this change.

Also modify the GetPcAdjustment for all different architectures so
that unless the relative pc is too small, it will return the minimum
amount that should be adjusted. This is to handle cases where we still
want to adjust the pc but it's in an invalid elf. Mostly this is for
handling cases when the pc is in jit gdb debug code so that we use the
right unwind information.

Bug: 77233204

Test: Passes unit tests for libbacktrace/libunwindstack.
Change-Id: Id73609adaf3b80a583584441de228156fec3afa7
2018-03-28 17:21:01 -07:00
Bowgo Tsai de2472d63e Adding odm.img for `fastboot flashall`
Bug: 64195575
Test: fastboot flashall
Change-Id: Ie6c20a1004867e7c9cfa1894abab9252316a9154
Merged-In: Ie6c20a1004867e7c9cfa1894abab9252316a9154
(cherry picked from commit 017217ec57)
2018-03-29 08:18:37 +08:00
Treehugger Robot 3ac694632c Merge changes from topic "recovery_dtbo"
* changes:
  Add a script to unpack boot image
  Add a recovery DTBO section to boot image
2018-03-29 00:02:57 +00:00
Elliott Hughes 539f3ddff5 Merge "Add "require partition-exists=" support." 2018-03-28 23:25:24 +00:00
Jaekyun Seok 55629d1300 [automerger skipped] Allow vendor-init-actionable for ro.debuggable
am: fce960cdf4  -s ours

Change-Id: If72d9fcb40bc79137e9290dd1bb0a27fa14b0ba4
2018-03-28 22:54:36 +00:00
Josh Gao 2de2ade387 adbd: increase oom_score_adj for `adb shell`
Previously, processes started via `adb shell` have an oom_score_adj of
-1000, making them invisible to the oom killer. This makes running a
process that consumes all memory (e.g. by leaking in a loop) lead to
the entire rest of the system (including adbd, because of bad
heuristics in the kernel) being oom killed before getting to it.

Bug: http://b/63143027
Test: `adb shell cat /proc/self/oom_score_adj` with adb root
Change-Id: I59111134e36dc271adf4c1dd4bd4400d4fe6aee0
2018-03-28 15:01:23 -07:00
Treehugger Robot 45562bfb63 Merge changes Iea2a3055,I6582cfc6
* changes:
  adb: start building windows test again.
  adb: fix windows test build.
2018-03-28 21:59:33 +00:00
Elliott Hughes d08c9102d6 OWNERS for system/core/mkbootimg.
Bug: N/A
Test: N/A
Change-Id: I9007898e29727892a166f4445c9b112987a97d7d
2018-03-28 14:48:59 -07:00
Bowgo Tsai 85fc6a91c0 Merge "Adding odm.img for `fastboot flashall`" am: cdc553d042
am: b526c2f785

Change-Id: I77d339294f116cbdd1279442b59e6ca8b295e175
2018-03-28 21:29:48 +00:00
Jaekyun Seok da4b0a27fb Merge "Allow vendor-init-actionable for ro.debuggable" am: 5e7de48f03
am: 000e274f9a

Change-Id: I266c01a444a76b2de3378399a5b6c0fc154b901f
2018-03-28 21:27:23 +00:00
Hridya Valsaraju 02c08cc347 Add a script to unpack boot image
The script prints out the boot image header
contents and extracts the kernel, ramdisk,
second bootloader and recovery DTBO images.

Bug: 74763691
Test: unpack_bootimg --boot_img $OUT/recovery.img

Change-Id: Iadbca81c157d9e4607f808a14468ab5542347507
2018-03-28 21:25:41 +00:00
Bowgo Tsai b526c2f785 Merge "Adding odm.img for `fastboot flashall`"
am: cdc553d042

Change-Id: Ieec9dd04d8dbc3fcf348a118529f168f710426cf
2018-03-28 20:58:12 +00:00
Jaekyun Seok 000e274f9a Merge "Allow vendor-init-actionable for ro.debuggable"
am: 5e7de48f03

Change-Id: Ib5b96ecd02860cc66f84defd1f0dcf8830d9e11d
2018-03-28 20:54:51 +00:00
Josh Gao 541a8656c4 adb: restore adb/adb.exe in the list of artifacts.
Test: m dist
Change-Id: Iba44a03e79af9242bfe36efb736496f8db720ebf
2018-03-28 12:57:48 -07:00
Hridya Valsaraju 147b355bb3 Add a recovery DTBO section to boot image
For non-A/B devices, the recovery partition should
be self-sufficient and not depend on any other
partition. Since recovery may need access to devices
added to the DT by overlays(for eg.display), we need to
make sure that the the recovery image also contains
the information from the DTBO image.

The following fields are added to the boot image
header for this purpose:
-boot header version
-header size
-recovery dtbo size
-recovery dtbo address

Bug: 74763691
Test: unpack_bootimage --boot_img $OUT/recovery.img
      diff out/extracted_dtbo $TOP/device/google/wahoo-kernel/dtbo.img

Change-Id: I1969859038b84fac1e4a71f79f2f546b9cacffc8
2018-03-28 12:53:21 -07:00
Elliott Hughes 5620d224b6 Add "require partition-exists=" support.
The Pixel 2 system images release was a bit of a disaster because anyone
using an old version of fastboot would blindly flash too few partitions,
potentially bricking their device. This change lets us add a line to
the android-info.txt file for a device with a new partition.

Also error out sooner in such cases by checking the requirements
immediately, rather than optimistically unpacking everything first.

Switch Action over to C++ to fix memory issues.

Bug: http://b/77158188 (partition checking)
Bug: http://b/74444116 (error out sooner)
Test: manual testing with a modified android-info.txt
Change-Id: I58b426cad410107e368f35f5725216d07281dd97
2018-03-28 12:43:53 -07:00
Treehugger Robot cdc553d042 Merge "Adding odm.img for `fastboot flashall`" 2018-03-28 19:42:30 +00:00
Jaekyun Seok fce960cdf4 Allow vendor-init-actionable for ro.debuggable
Some partners are using ro.debuggable as action trigger to config a
product differently according to its value.

Bug: 75987246
Test: succeeded building and tested taimen
Change-Id: I4cc57e7b52e17fc89e585afa0a8a10925e47fac8
Merged-In: I4cc57e7b52e17fc89e585afa0a8a10925e47fac8
(cherry picked from commit 4f214c5179)
2018-03-29 04:21:22 +09:00
Treehugger Robot 5e7de48f03 Merge "Allow vendor-init-actionable for ro.debuggable" 2018-03-28 19:15:16 +00:00
Tom Cherry 87f114d3f3 Merge "Revert "fs_config: Move hostapd to /vendor/bin/hw"" into pi-dev
am: 36a716dc1f

Change-Id: Id8dad48e5fe42e8671bf2ceb1fcdbc28cb087ffc
2018-03-28 18:45:07 +00:00
Tom Cherry 36a716dc1f Merge "Revert "fs_config: Move hostapd to /vendor/bin/hw"" into pi-dev 2018-03-28 18:30:49 +00:00
Tom Cherry 666464a180 Revert "fs_config: Move hostapd to /vendor/bin/hw"
This reverts commit 656b75c77c.

Capability bits are moving from fs_config.cpp to the associated init
scripts for daemons on /vendor.

Bug: 74554159
Test: wifi tethering works on walleye
2018-03-28 18:29:02 +00:00
Bowgo Tsai 017217ec57 Adding odm.img for `fastboot flashall`
Bug: 64195575
Test: fastboot flashall
Change-Id: Ie6c20a1004867e7c9cfa1894abab9252316a9154
2018-03-29 01:31:51 +08:00
Jaekyun Seok 4f214c5179 Allow vendor-init-actionable for ro.debuggable
Some partners are using ro.debuggable as action trigger to config a
product differently according to its value.

Bug: 75987246
Test: succeeded building and tested taimen
Change-Id: I4cc57e7b52e17fc89e585afa0a8a10925e47fac8
2018-03-28 12:21:03 +09:00
Greg Kaiser f97f242c30 [automerger skipped] Merge "lmkd: Protect against buffer overflow" into pi-dev
am: 136f765fb3  -s ours

Change-Id: I5f8cf0f5dad1e93cbe51d0fbfad785d6b8bc831d
2018-03-28 03:19:15 +00:00
TreeHugger Robot 136f765fb3 Merge "lmkd: Protect against buffer overflow" into pi-dev 2018-03-28 01:44:33 +00:00
Greg Kaiser d6d847142b lmkd: Protect against buffer overflow
We're passing a 'line' whose backing buffer is PAGE_MAX in size
into memory_stat_parse_line().  We protect overflowing the smaller
LINE_MAX 'key' buffer via some C preprocessing macros to assure
we limit the size.

Test: Local build with LMKD_LOG_STATS set for this file.
Bug: 76220622
Merged-In: I9e50d4270f7099e37a9bfc7fb9b9b95cc7adb086
Change-Id: I9e50d4270f7099e37a9bfc7fb9b9b95cc7adb086
2018-03-27 21:59:31 +00:00
Christopher Ferris d5a93f925c Method to avoid skipping frames for local unwinds.
am: af16967ec8

Change-Id: I61485a5b085b7672f472724f2b6cbccf5e832549
2018-03-27 21:01:27 +00:00
Christopher Ferris af16967ec8 Method to avoid skipping frames for local unwinds.
In cases where there might be a crash in the unwind library itself,
we need a method to avoid skipping these frames or we won't be able
to see the actual crash.

Added unit test for this behavior.

Bug: 74121887

Test: Ran unit tests on host and target.
Change-Id: I45825020c174016af39dd8ffdc67acb72a24ad4d
(cherry picked from commit 458f4e725d)
2018-03-27 11:12:41 -07:00
Tom Cherry 54c73fa7c1 Merge "Verify the SELabels used in property_contexts" into pi-dev
am: 677bed578e

Change-Id: I68788f1113ca430a29a2bd83a561e9b7afff184f
2018-03-27 16:55:24 +00:00
Tom Cherry 677bed578e Merge "Verify the SELabels used in property_contexts" into pi-dev 2018-03-27 16:45:39 +00:00
Bowgo Tsai 493e6ec922 [automerger skipped] Merge "Adding product.img for `fastboot flashall`" into pi-dev
am: 88993acd95  -s ours

Change-Id: Ia394e2577b2420aec493f1ced657de339ebdb538
2018-03-27 04:40:42 +00:00
TreeHugger Robot 88993acd95 Merge "Adding product.img for `fastboot flashall`" into pi-dev 2018-03-27 04:30:40 +00:00
Jerry Zhang 0b2ecd9d57 Merge "Remove sys.usb.ffs.mtp.ready property" into pi-dev
am: ca47ae3513

Change-Id: I3af594b34b1045fde4e5928935e61f892afeccd1
2018-03-27 03:21:11 +00:00
Jerry Zhang ca47ae3513 Merge "Remove sys.usb.ffs.mtp.ready property" into pi-dev 2018-03-27 02:49:02 +00:00
Luis Hector Chavez 2edb005875 [automerger skipped] Merge "Allow android::base::ScopeGuard in STL containers" into pi-dev
am: 64250b5abe  -s ours

Change-Id: I224a160667f7c5a8a61b5640a902ebbf65560dd7
2018-03-27 02:43:22 +00:00
TreeHugger Robot 64250b5abe Merge "Allow android::base::ScopeGuard in STL containers" into pi-dev 2018-03-27 02:29:20 +00:00
Bowgo Tsai bbf2cb3976 Merge "Adding product.img for `fastboot flashall`" am: c41ff1b366
am: a56e2e8dce

Change-Id: I345fe212d021864803b1f12447af1a8ded299826
2018-03-27 01:55:22 +00:00
Bowgo Tsai a56e2e8dce Merge "Adding product.img for `fastboot flashall`"
am: c41ff1b366

Change-Id: I8beb7ba3b313112e7ae84d74a894b76f670b811b
2018-03-27 01:49:13 +00:00