Commit graph

51428 commits

Author SHA1 Message Date
David Anderson
accbf6d963 Merge "libdm: Fix race conditions in LoopControl::Attach." am: 974dadf904
am: 4605a96076

Change-Id: Ia75415390bd61d4625bf7e7547c660b2b1e23f78
2019-07-16 13:10:15 -07:00
David Anderson
4605a96076 Merge "libdm: Fix race conditions in LoopControl::Attach."
am: 974dadf904

Change-Id: Ieb08ab0217f5d9a3dc9538672bbaf7037487b49b
2019-07-16 12:47:03 -07:00
David Anderson
974dadf904 Merge "libdm: Fix race conditions in LoopControl::Attach." 2019-07-16 19:03:09 +00:00
Tom Cherry
814f744fac Merge "Add nolint for implicit borrowed_fd constructors" am: 8987f061c4
am: 2d9148abb2

Change-Id: I190836f1b3e801decf6b39c448d6254c7806d8e1
2019-07-16 01:42:16 -07:00
Tom Cherry
2d9148abb2 Merge "Add nolint for implicit borrowed_fd constructors"
am: 8987f061c4

Change-Id: Ibfb6497be968af5e008c1b20de9de9e9041706a5
2019-07-16 01:37:16 -07:00
Treehugger Robot
8987f061c4 Merge "Add nolint for implicit borrowed_fd constructors" 2019-07-16 04:11:20 +00:00
Steven Moreland
28d1ddd03b Merge "Reserve 'init'." am: a19f51eccc
am: 2cdc6d7baf

Change-Id: I871fc91eb9cd5adb159cd98c1820dab7d24fc7ed
2019-07-15 19:59:48 -07:00
Steven Moreland
2cdc6d7baf Merge "Reserve 'init'."
am: a19f51eccc

Change-Id: I7074046592fae42725536df2c2820e9b52983305
2019-07-15 19:50:45 -07:00
Steven Moreland
08a65aa2d1 Merge "Remove obsolete subdirs entry." am: 100e8ffbcd
am: b8d01f377f

Change-Id: I39d95123c45da8104dc8f21f65ac9944ad682474
2019-07-15 19:42:46 -07:00
Treehugger Robot
a19f51eccc Merge "Reserve 'init'." 2019-07-16 02:35:29 +00:00
Steven Moreland
b8d01f377f Merge "Remove obsolete subdirs entry."
am: 100e8ffbcd

Change-Id: I3e11bcc22e77e9c1f36278721c7f8bb7e05d5a08
2019-07-15 19:32:53 -07:00
Treehugger Robot
100e8ffbcd Merge "Remove obsolete subdirs entry." 2019-07-16 02:02:40 +00:00
Kiyoung Kim
78f234e0a4 Merge "Run linkerconfig from init process" am: 2f174171d7
am: 7b64a9a73a

Change-Id: I6956a7fb29162d0209ab496ecb378d0a7ff42aaa
2019-07-15 17:50:29 -07:00
Ryan Prichard
bdbed08c47 Merge changes I5e33e5bf,I64237006 am: c37f4a4199
am: 4440f8bc20

Change-Id: I6db77221e12d16280c8578c4ba6d6fb5050c59da
2019-07-15 17:43:22 -07:00
Christopher Ferris
7a7b844499 Merge "Optimize code that only uses PageMap call." am: 1e7b753c36
am: bdcd4f8e85

Change-Id: I1ac672c4104b50bfe433547c8e99956c26b41b16
2019-07-15 17:40:35 -07:00
David Anderson
95a874d7bf Merge "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid."" am: 4c3d9b2491
am: 54db37769c

Change-Id: I8edcd34fa21ae84948a9c6fcb10ae9ba8245e7fe
2019-07-15 17:39:35 -07:00
Kiyoung Kim
7b64a9a73a Merge "Run linkerconfig from init process"
am: 2f174171d7

Change-Id: I1c228374303842ce7d02cb30ee23c83ef43808d9
2019-07-15 17:39:34 -07:00
Ryan Prichard
4440f8bc20 Merge changes I5e33e5bf,I64237006
am: c37f4a4199

Change-Id: I1afe1a7cd33f6316411143429a593d29ac192516
2019-07-15 17:35:07 -07:00
Kiyoung Kim
2f174171d7 Merge "Run linkerconfig from init process" 2019-07-16 00:32:13 +00:00
Christopher Ferris
bdcd4f8e85 Merge "Optimize code that only uses PageMap call."
am: 1e7b753c36

Change-Id: I4a8e28e4e929eaf3c308cd851ef4d12f24e6b817
2019-07-15 17:31:26 -07:00
David Anderson
54db37769c Merge "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid.""
am: 4c3d9b2491

Change-Id: I4749aa8c1438f9b1c2ff04c100af297aec62e732
2019-07-15 17:30:33 -07:00
Ryan Prichard
c37f4a4199 Merge changes I5e33e5bf,I64237006
* changes:
  Make android_load_sphal_library thread-safe
  Switch libvndksupport's linker.c to C++
2019-07-16 00:06:21 +00:00
Christopher Ferris
1e7b753c36 Merge "Optimize code that only uses PageMap call." 2019-07-16 00:00:18 +00:00
David Anderson
4c3d9b2491 Merge "Revert "Remove libfiemap_writer from fs_mgr and move it to gsid."" 2019-07-15 23:55:25 +00:00
David Anderson
31656c2c53 Revert "Remove libfiemap_writer from fs_mgr and move it to gsid."
This reverts commit 20fbf0d672.

Reason for revert: broke build

Change-Id: I6914455ba1f0fd56fbf3572f349242d734281610
2019-07-15 23:52:49 +00:00
Tom Cherry
bea193ea9b Merge "init: clean up file / socket descriptor creation" am: c8620ddafe
am: 47d680f924

Change-Id: Ic06579d452da17efe6e9679b7ab20495fee1afb5
2019-07-15 16:48:08 -07:00
Tom Cherry
bec99e1dc6 Merge "Add reserved AID ranges for all partitions" am: 2a0a0810a1
am: 306ca15d79

Change-Id: I68ac1fee59fe52151b7ddc86ccf215c23dbf3911
2019-07-15 16:47:29 -07:00
Tom Cherry
47d680f924 Merge "init: clean up file / socket descriptor creation"
am: c8620ddafe

Change-Id: I0d33e2f797147f1c6a49e2b323b7ac09f93604c9
2019-07-15 16:33:17 -07:00
Tom Cherry
306ca15d79 Merge "Add reserved AID ranges for all partitions"
am: 2a0a0810a1

Change-Id: I639c3ed66293da360318b5979480c1def45f1955
2019-07-15 16:32:41 -07:00
David Anderson
20b52851ae Merge "Remove libfiemap_writer from fs_mgr and move it to gsid." am: 3d5b8bc373
am: 759f119fc9

Change-Id: I61cd9d37ec015228f6ead73fda69d37126c45791
2019-07-15 16:31:44 -07:00
David Anderson
759f119fc9 Merge "Remove libfiemap_writer from fs_mgr and move it to gsid."
am: 3d5b8bc373

Change-Id: I8950fcf3b780da4e00f813b90e6689d0a164141e
2019-07-15 16:22:42 -07:00
Tom Cherry
c8620ddafe Merge "init: clean up file / socket descriptor creation" 2019-07-15 23:20:13 +00:00
Tom Cherry
2a0a0810a1 Merge "Add reserved AID ranges for all partitions" 2019-07-15 23:19:41 +00:00
David Anderson
3d5b8bc373 Merge "Remove libfiemap_writer from fs_mgr and move it to gsid." 2019-07-15 22:54:21 +00:00
David Anderson
20fbf0d672 Remove libfiemap_writer from fs_mgr and move it to gsid.
gsid is the only consumer for this library, and it's unlikely to grow
beyond gsid.

Bug: 134536978
Test: gsid builds
Change-Id: Ib632b1dd8de3e29c02d1fe443a1e409af5f1257d
2019-07-15 22:53:39 +00:00
Steven Moreland
4c79df91a9 Remove obsolete subdirs entry.
Change-Id: I3327df74179d2ba1ffd66da59e5196f34dfe3974
Bugs: me
Test: N/A
2019-07-15 15:14:34 -07:00
Steven Moreland
ceb36d08f4 Reserve 'init'.
This makes `pathmod init` and `gomod init` work, and it also reserves
the 'init' for potential future usage.

Change-Id: I6990bf421211b93d58d978d84d46474ff243e808
Bugs: me
Test: pathmod init; gomod init
2019-07-15 15:12:56 -07:00
Tom Cherry
aa55ee6044 Add nolint for implicit borrowed_fd constructors
bpfloader uses both clang-tidy and this header, so the below lint
warnings are generated:

/work/aosp/system/core/base/include/android-base/unique_fd.h:261:18:
  warning: single-argument constructors must be marked explicit to
  avoid unintentional implicit conversions
  [google-explicit-constructor]
  /* implicit */ borrowed_fd(int fd) : fd_(fd) {}
                 ^
                 explicit

/work/aosp/system/core/base/include/android-base/unique_fd.h:263:18:
  warning: single-argument constructors must be marked explicit to
  avoid unintentional implicit conversions
  [google-explicit-constructor]
  /* implicit */ borrowed_fd(const unique_fd_impl<T>& ufd) : fd_(ufd.get()) {}
                 ^
                 explicit

Add NOLINT to quiet them.

Test: build without this lint warning
Change-Id: I5241938c33070b0fa39888289b8ca67d6d94ac73
2019-07-15 15:00:23 -07:00
Ryan Prichard
8c733615aa Make android_load_sphal_library thread-safe
Also: remove an obsolete comment from linker_test.cpp. The test program is
at /data/nativetest[64]/libvndksupport-tests/libvndksupport-tests, which
may will be in the system or legacy configuration, and either the "sphal"
or "default" namespace will be visible.

Bug: none
Test: run libvndksupport-tests, device boots
Change-Id: I5e33e5bf1402a0368e046b03827c216789b02c96
2019-07-15 13:58:51 -07:00
Ryan Prichard
807d9d62d8 Switch libvndksupport's linker.c to C++
Bug: none
Test: device boots
Change-Id: I64237006a7f903647c8d8f7ca681b1da23ac53a9
2019-07-15 13:43:05 -07:00
Daniel Rosenberg
e48e3c8931 Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev
am: 11bf3545ab

Change-Id: I33b45da532ba677053c0866504a22ca43b1284b2
2019-07-15 13:22:02 -07:00
Daniel Rosenberg
11bf3545ab Merge "Reland "Revert "rootdir / sdcard : Stop creating /data/media/obb.""" into qt-dev 2019-07-15 19:56:35 +00:00
Tom Cherry
2e4c85f157 init: clean up file / socket descriptor creation
clang-tidy hinted that some of this code wasn't right.  Looking
deeper, there is really not much related to file and socket
descriptors, except that they're published in similar ways to the
environment.  All of the abstraction into a 'Descriptor' class takes
us further away from specifying what we really mean.

This removes that abstraction, adds stricter checks and better errors
for parsing init scripts, reports sockets and files that are unable to
be acquired before exec, and updates the README.md for the passcred
option.

Test: build, logd (uses files and sockets) works
Change-Id: I59e611e95c85bdbefa779ef69b32b9dd4ee203e2
2019-07-15 12:17:30 -07:00
Mark Salyzyn
d5ebef055f Merge "bootstat: power_on* handling" am: 91338a6aa2
am: 61c7cc6d88

Change-Id: I88c240b3f730095237f0c79d2e15f3385c3ce7a1
2019-07-15 09:09:57 -07:00
Mark Salyzyn
61c7cc6d88 Merge "bootstat: power_on* handling"
am: 91338a6aa2

Change-Id: Ia3cccc615dbb49c3624e73ea248b9e3c5d0ad61d
2019-07-15 08:59:33 -07:00
Tom Cherry
dc4c49dfb7 Merge "Add noexcept to missing places in expected.h" am: a8b0517108
am: e1f381603d

Change-Id: I9077197896d325c31df172eeb91ef8ca67ade847
2019-07-15 08:50:27 -07:00
Mark Salyzyn
91338a6aa2 Merge "bootstat: power_on* handling" 2019-07-15 15:47:04 +00:00
Tom Cherry
e1f381603d Merge "Add noexcept to missing places in expected.h"
am: a8b0517108

Change-Id: I414d6976260249be40b9c8e99dc8a8798089b6d6
2019-07-15 08:42:29 -07:00
Tom Cherry
a8b0517108 Merge "Add noexcept to missing places in expected.h" 2019-07-15 15:12:46 +00:00
David Anderson
8c46ed850a Merge "fs_mgr: Remove the timeout parameter to DestroyLogicalPartition." am: cd22e3a6f6
am: 8c3c846cf3

Change-Id: Ia3b4809899e08c9ce6c62d0aaca4757d8e02f812
2019-07-13 11:26:09 -07:00