Commit graph

44409 commits

Author SHA1 Message Date
Tom Cherry
088da2d4fe Merge "Update fs_mgr_update_verity_state() for new C++ Fstab"
am: ac1812ddb5

Change-Id: If493ebfa391324f637d2066cd99e1fcbfe44e40c
2018-12-10 10:38:07 -08:00
Tom Cherry
ac1812ddb5 Merge "Update fs_mgr_update_verity_state() for new C++ Fstab" 2018-12-10 17:17:28 +00:00
Roland Levillain
4bcae06f9b Merge "Add Android Runtime APEX lib directories to the system linker configuration."
am: d768a0c13d

Change-Id: I92f8c1a167042d2e9e662c70ec2edff18256e88a
2018-12-10 07:18:43 -08:00
Roland Levillain
d768a0c13d Merge "Add Android Runtime APEX lib directories to the system linker configuration." 2018-12-10 15:04:29 +00:00
David Anderson
b17ce9767d Merge "fastboot: Wait for reboot-fastboot to complete before signaling success."
am: b81bc9ec00

Change-Id: Iae7e977baae9e2c939ad1d639ee495c3f8315677
2018-12-07 22:24:35 -08:00
David Anderson
b81bc9ec00 Merge "fastboot: Wait for reboot-fastboot to complete before signaling success." 2018-12-08 06:19:52 +00:00
Sandeep Patil
cea993c18e Merge "Add OWNERS file"
am: 581402bab9

Change-Id: I71c9b68266e510abe64bfd32a3c290f12e42d00d
2018-12-07 22:11:04 -08:00
Treehugger Robot
581402bab9 Merge "Add OWNERS file" 2018-12-08 06:05:09 +00:00
Sandeep Patil
f293e58a89 Merge "procmem2: Finish implementing all options"
am: 16aeee42b1

Change-Id: I0462c285246e6c281b1f81680b1b0d4a11ca7be0
2018-12-07 21:33:34 -08:00
Treehugger Robot
16aeee42b1 Merge "procmem2: Finish implementing all options" 2018-12-08 05:16:33 +00:00
Andreas Gampe
aac7fa53d4 Merge "Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by default""
am: 40f96aff36

Change-Id: I73a27d0f75fe0b3dc69ef2123d4180af1dac3dda
2018-12-07 20:43:27 -08:00
Treehugger Robot
40f96aff36 Merge "Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by default"" 2018-12-08 04:36:35 +00:00
Sandeep Patil
87b96ba92a Merge changes from topic "procrank-ready"
am: d346349d50

Change-Id: I3ac4e3def81c1a1f6585ec6d2f31be182ebb7400
2018-12-07 18:00:30 -08:00
Sandeep Patil
d346349d50 Merge changes from topic "procrank-ready"
* changes:
  Add procrank2
  libmeminfo: defer maps reading only when required for procmeminfo
  libmeminfo: Add support to reset workingset without procmeminfo objects
  libmeminfo: Add support to fiter accounting based on page flags
  libmeminfo: Add support to read zram memory consumption
  libmeminfo: Add support for counting swap pages
2018-12-08 01:44:13 +00:00
David Anderson
11d6d278cd fastboot: Wait for reboot-fastboot to complete before signaling success.
Bug: N/A
Test: manual test
Change-Id: I07495c1befcf63607c9996d6da6b4df05c060641
2018-12-07 16:39:55 -08:00
Tom Cherry
02eff5cccd Update fs_mgr_update_verity_state() for new C++ Fstab
Bug: 62292478
Test: boot and check verity state
Change-Id: I4912a16ada9a6d72480d7ac905654b764c5d18b6
2018-12-07 14:14:54 -08:00
Andreas Gampe
d831773ec6 Revert "Use apex/com.android.resolv/lib64/libned_resolv.so by default"
This reverts commit eb4384c2a0.

Reason for revert: Breaks tests

Bug: 119527674
Bug: 120661824
Change-Id: I2f452f25e7b4e070e766b84cdefdf1800244b150
Test: N/A
2018-12-07 21:46:06 +00:00
Patrick Baumann
29e7688434 Merge "Removes ASEC-related install flags"
am: bcc2d60826

Change-Id: I0d9a7a783d9ceb205d6a4516e647ca68002a7ebf
2018-12-07 10:28:38 -08:00
Treehugger Robot
bcc2d60826 Merge "Removes ASEC-related install flags" 2018-12-07 18:11:09 +00:00
Tri Vo
f3f10cd4e3 Merge "Remove obsolete ueventd.rc rules."
am: dc978cc15b

Change-Id: Ica2dea1c98d9a3de8607a39b39da2f405835020b
2018-12-07 10:03:28 -08:00
Tri Vo
dc978cc15b Merge "Remove obsolete ueventd.rc rules." 2018-12-07 17:53:00 +00:00
Sandeep Patil
44a4c0fdae Add OWNERS file
Change-Id: Id8421b9d7fb391615232a8a8e75ad8a68e20dfbc
Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-12-07 09:29:03 -08:00
Sandeep Patil
99ed4a0b4e procmem2: Finish implementing all options
In the same time replace iomanipulators with
::android::base::StringPrintf which makes the output much more readable
and the overall program simpler.

Bug: 114325007
Bug: 111694435
Test: procmem 1
Test: procmem -W 1
Test: procmem -u 1
Test: procmem -p 1
Test: procmem -w 1
Test: procmem -w -u 1
Test: procmem -w -p 1

Change-Id: Ibf7ef59b24dfcb851c78a3b2fad672d96a708b98
Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-12-07 09:16:35 -08:00
Sandeep Patil
a14119d069 Add procrank2
Implement procrank using new libmeminfo APIs. procrank2 is functionally
equivalent to procrank except for the part where the old procrank would
print processes under each oomadj level if called with 'procrank -c -o'.

The output format of 'procrank2' is identical to that of 'procrank'.
'procrank2' also gives significant performance boost over 'procrank' but
does cost a more memory as the library is written to 99% use case where
callers almost always want to read the memory usage of hte process.

Bug: 114325007
Bug: 111694435
Test:
     # adb push /google/data/ro/users/ss/sspatil/test-memutils.sh /data/local/tmp/
     # adb push procmem2 /data/local/tmp && adb push procrank2 /data/local/tmp
     # adb root && adb shell
     $ cd /data/local/tmp/
     $ chmod +x test-memutils.sh
     $ ./test-memutils.sh 2>&1 | tee test.log
Test:
  procrank:
    0m00.43s real     0m00.11s user     0m00.32s system
  procrank2:
    0m00.42s real     0m00.05s user     0m00.36s system

Change-Id: I37b71a4625248e333ba01801c0d8d7ef348e4cfa
Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-12-07 09:15:16 -08:00
Mark Salyzyn
a4cea680a3 Merge "fs_config: add product and product_services to the scanning."
am: ddf03be20a

Change-Id: I5adc6b8e664b6c3f71bd804e8ac8f3210fc1e929
2018-12-07 09:03:07 -08:00
Treehugger Robot
ddf03be20a Merge "fs_config: add product and product_services to the scanning." 2018-12-07 16:52:04 +00:00
Tom Cherry
7950973b79 Merge "ueventd: allow configuring SO_RCVBUF(FORCE) for the ueventd socket"
am: a64e9e843d

Change-Id: Iccecb0d9a32df3f528ffe11551b1b0119e0b7d45
2018-12-07 08:41:52 -08:00
Tom Cherry
a64e9e843d Merge "ueventd: allow configuring SO_RCVBUF(FORCE) for the ueventd socket" 2018-12-07 16:27:20 +00:00
Patrick Baumann
24439442a8 Removes ASEC-related install flags
Bug: 109941548
Test: install still works
Change-Id: Ibaf87e678217a1ce140b4024d16ceb8d27fadec0
2018-12-07 16:15:31 +00:00
Henry Daitx
aef367d8cd Merge "Fix adb not correctly reading return code from DeployAgent"
am: 73d03dc804

Change-Id: Icab80491069a33f6377897675268d0b834d57a1c
2018-12-07 01:07:31 -08:00
Treehugger Robot
73d03dc804 Merge "Fix adb not correctly reading return code from DeployAgent" 2018-12-07 08:58:35 +00:00
chenbruce
518bd1235c Merge "Use apex/com.android.resolv/lib64/libned_resolv.so by default"
am: 87e10ba280

Change-Id: I0d43b11a93e73acd30123f90276f7c6e2d722075
2018-12-06 23:17:19 -08:00
Treehugger Robot
87e10ba280 Merge "Use apex/com.android.resolv/lib64/libned_resolv.so by default" 2018-12-07 06:58:51 +00:00
yaochen
ad4e33818b Merge "Add a function to pass byte array to the log context."
am: 0db6f49cad

Change-Id: I4a26a645fba5a30c187d689f02d079fbd29032bf
2018-12-06 19:22:19 -08:00
yaochen
0db6f49cad Merge "Add a function to pass byte array to the log context." 2018-12-07 03:11:02 +00:00
Tri Vo
d3b0b2708b Remove obsolete ueventd.rc rules.
/dev/* nodes referenced in the removed rules are not present on Pixel
devices, i.e. android platform doesn't depend on these nodes. If a
device relies on one of these rules, the rule should be added to the
device-specific ueventd.rc.

Bug: 110962171
Test: boot walleye
Test: init_tests
Change-Id: I3262475d4ff22386e8da0436efaf98b208e4fa1c
2018-12-06 16:07:20 -08:00
Mark Salyzyn
757658c78d fs_config: add product and product_services to the scanning.
Test: compile
Bug: 119310326
Change-Id: I67ba155e4a03731d402cdfcf06ca80ad0c4ab2ed
2018-12-06 22:14:14 +00:00
Tom Cherry
e29101077c ueventd: allow configuring SO_RCVBUF(FORCE) for the ueventd socket
Some configurations won't allow ueventd to have CAP_NET_ADMIN, so the
new default size of 16M is not possible for those.  Those
configurations also won't need such a large buffer size, so this
change allows devices to customize the SO_RCVBUF(FORCE) size for the
uevent socket.

This is done by adding the line 'uevent_socket_rcvbuf_size <size>' to
your device's ueventd.rc file.  <size> is specified as a byte count,
for example '16M' is 16MiB.

The last parsed uevent_socket_rcvbuf_size line is the one that is
used.

Bug: 120485624
Test: boot sailfish
Test: ueventd unit tests
Change-Id: If8123b92ca8a9b089ad50318caada2f21bc94707
2018-12-06 13:35:52 -08:00
Florian Mayer
9daf5f4d40 Merge "Add missing includes."
am: e813ad4b4f

Change-Id: I6a3ab598ece98421f578310d6ebb6b1f2703895f
2018-12-06 13:24:48 -08:00
Yao Chen
6bd71aef37 Add a function to pass byte array to the log context.
The existing APIs will truncate the byte array in case of '\0' in between.

Test: test_drive with atom 103
Change-Id: I104d35b330c6b52e2fdce1f5d4305dca08228f1b
2018-12-06 13:03:12 -08:00
Treehugger Robot
e813ad4b4f Merge "Add missing includes." 2018-12-06 20:22:17 +00:00
Florian Mayer
3f1f2e07ab Add missing includes.
Test: Builds.
Change-Id: Ia8b79154902503cdd774dc3b4523466123b4324c
2018-12-06 10:09:20 -08:00
Henry Daitx
f21edf3edd Fix adb not correctly reading return code from DeployAgent
Certain error conditions were getting lost because adb was wrongly
reading DeployAgent's return code as always 0.

Test: mm -j 72
Test: adb install -r --fastdeploy --force-agent --local-agent /mnt/raid/boat-attack-apk/boat-attack-swappy.apk

Bug: 120197330
Change-Id: If835fd6ca2051be8e5ff6c957e08b1e458053989
2018-12-06 15:46:38 +00:00
Mark Salyzyn
ac1cd6550d Merge changes I368d3a56,Idb769991,Ia158b6ed
am: 215d1d510e

Change-Id: I881c2a2fc2120fb25568318a35e6c36c2fecb217
2018-12-06 07:41:36 -08:00
Mark Salyzyn
215d1d510e Merge changes I368d3a56,Idb769991,Ia158b6ed
* changes:
  fs_mgr: overlay: use alternate for backing storage
  fs_mgr: overlay: split out fs_mgr_overlayfs_create_scratch()
  fs_mgr: overlay: split out fs_mgr_overlayfs_make_scratch()
2018-12-06 15:26:47 +00:00
Florian Mayer
8cc36a1f6b Merge "Read .note.gnu.build-id."
am: a5913bdd07

Change-Id: I7bc9d015f0406429cf1694074bb6b6318059d96c
2018-12-06 03:06:29 -08:00
Florian Mayer
a5913bdd07 Merge "Read .note.gnu.build-id." 2018-12-06 10:57:26 +00:00
Mike Yu
138c233264 Merge "libsysutils can be linked statically"
am: 675a70be41

Change-Id: Ifbb2fce38fb39e4f1457cacba63aabdcfa6f79aa
2018-12-06 01:06:34 -08:00
Mike Yu
675a70be41 Merge "libsysutils can be linked statically" 2018-12-06 08:52:46 +00:00
Elliott Hughes
e2f017157a Merge "Update shell documentation for the current state of master."
am: f2233fd67a

Change-Id: I7f31ef326c9e7eee754fda167925de0ea69d9c36
2018-12-05 20:40:27 -08:00