Commit graph

49151 commits

Author SHA1 Message Date
Hans Boehm
87db3a38fe Merge "Revert "Revert "Fix wp and sp comparison bugs""" am: bca89d7bbc am: 8d1aef81d6
am: c9c666ffed

Change-Id: I068081a3c213f5b603dc4e1881c4fecbb3e0b3c3
2019-03-14 10:14:12 -07:00
Hans Boehm
c9c666ffed Merge "Revert "Revert "Fix wp and sp comparison bugs""" am: bca89d7bbc
am: 8d1aef81d6

Change-Id: Id5801e89ceb9733929b3e27d036f0da29660bbe4
2019-03-14 10:09:02 -07:00
Hans Boehm
8d1aef81d6 Merge "Revert "Revert "Fix wp and sp comparison bugs"""
am: bca89d7bbc

Change-Id: I6a0fbce87209d40ca788e7b2ba891488725ee29a
2019-03-14 10:03:52 -07:00
Hans Boehm
bca89d7bbc Merge "Revert "Revert "Fix wp and sp comparison bugs""" 2019-03-14 16:55:49 +00:00
Neil Fuller
020f61bca8 [automerger skipped] Merge "Move the logic for creating APEX-related symlinks" am: cb7ac9d752 am: 26fc502a64
am: 424253f257 -s ours
am skip reason: change_id I92a52d0b5ef97e8cb4f780691f8594e40f2fa6b3 with SHA1 0ed52b789d is in history

Change-Id: I4786a1fae39f66ed149defc451a2c07e50e32c13
2019-03-14 09:34:07 -07:00
Neil Fuller
424253f257 Merge "Move the logic for creating APEX-related symlinks" am: cb7ac9d752
am: 26fc502a64

Change-Id: I49a439a93477b706f5c1bd9a8ccb1c6dd42ea196
2019-03-14 09:29:01 -07:00
Neil Fuller
26fc502a64 Merge "Move the logic for creating APEX-related symlinks"
am: cb7ac9d752

Change-Id: Ia0a5e6be6c8a15fa5720e0087823677d389a887c
2019-03-14 09:23:50 -07:00
Christopher Ferris
b7737bc7b9 Merge "Add support for displaying soname in an apk." am: 4886a5bd59 am: cb839e8475
am: 0fd3f965b8

Change-Id: Ica528031f31d82558b648046dc9a1721e108e030
2019-03-14 09:14:35 -07:00
Christopher Ferris
0fd3f965b8 Merge "Add support for displaying soname in an apk." am: 4886a5bd59
am: cb839e8475

Change-Id: I651e448ba74644335fbd7513061ed740b431e794
2019-03-14 09:08:18 -07:00
Neil Fuller
cb7ac9d752 Merge "Move the logic for creating APEX-related symlinks" 2019-03-14 16:06:08 +00:00
Christopher Ferris
cb839e8475 Merge "Add support for displaying soname in an apk."
am: 4886a5bd59

Change-Id: Id99d7d57656cc841d35162f37aa70f36f77db65c
2019-03-14 08:55:00 -07:00
Christopher Ferris
4886a5bd59 Merge "Add support for displaying soname in an apk." 2019-03-14 15:40:59 +00:00
Gavin Corkery
32d1bf07ca [automerger skipped] Merge "Rename data/pkg_staging to data/app-staging." am: ff3c13f52f am: a5589e817b
am: ddd3932823 -s ours
am skip reason: change_id Ic5729d60046e8825a2a94e3c3483ea8232a69ed2 with SHA1 ad0b2473dc is in history

Change-Id: I4257afb668d77d0afac960790f65ea920a92151e
2019-03-14 07:44:01 -07:00
Gavin Corkery
ddd3932823 Merge "Rename data/pkg_staging to data/app-staging." am: ff3c13f52f
am: a5589e817b

Change-Id: I947b13e44dd1a3cf77c07b6d57f117e7bb438cf5
2019-03-14 07:32:23 -07:00
Mark Salyzyn
f505c31da5 Merge "init: epoll: add events argument to RegisterHandler" am: 873ee642f2 am: b7154087a4
am: b7fcdaaa4e

Change-Id: I1155d843956ef2f568bd3f8f41dfa62a44838138
2019-03-14 07:26:59 -07:00
Gavin Corkery
a5589e817b Merge "Rename data/pkg_staging to data/app-staging."
am: ff3c13f52f

Change-Id: I4e63493ec05eb92fbcce6c7ed446a9f08a29bd88
2019-03-14 07:21:14 -07:00
Mark Salyzyn
b7fcdaaa4e Merge "init: epoll: add events argument to RegisterHandler" am: 873ee642f2
am: b7154087a4

Change-Id: I51df638a1cbb4997c3b88774b22a429f73a57d5c
2019-03-14 07:21:02 -07:00
Mark Salyzyn
b7154087a4 Merge "init: epoll: add events argument to RegisterHandler"
am: 873ee642f2

Change-Id: I45d4e0d034a3878f6f76ccceb5e0a6ac91d965e7
2019-03-14 07:15:52 -07:00
Gavin Corkery
ff3c13f52f Merge "Rename data/pkg_staging to data/app-staging." 2019-03-14 14:14:38 +00:00
Mark Salyzyn
873ee642f2 Merge "init: epoll: add events argument to RegisterHandler" 2019-03-14 14:11:27 +00:00
Roland Levillain
00c6d45ee9 Merge "Remove Valgrind entries from fs_config." am: e61d5ccf47 am: 710264b43b
am: 6ab844e1fe

Change-Id: I8ab7dcf37ed09045bfe9efe14a93048d6966c74e
2019-03-14 06:43:13 -07:00
Roland Levillain
6ab844e1fe Merge "Remove Valgrind entries from fs_config." am: e61d5ccf47
am: 710264b43b

Change-Id: I4b06036ef93556eba26d46cde2cf5e6936c5d503
2019-03-14 06:37:47 -07:00
Roland Levillain
710264b43b Merge "Remove Valgrind entries from fs_config."
am: e61d5ccf47

Change-Id: Ia26016e8d112794817bdb809146fad55e6eb3f04
2019-03-14 06:32:35 -07:00
Roland Levillain
e61d5ccf47 Merge "Remove Valgrind entries from fs_config." 2019-03-14 13:22:15 +00:00
Neil Fuller
16e5ae3b39 Move the logic for creating APEX-related symlinks
The existing location of logic for creating symlinks to files that have
moved into APEX does not get executed for -user builds, only
-userdebug and -eng. The new location is equally arbitrary but appears
to be invoked for -user, -userdebug and -eng targets.

Tested with:
make cleaninstall && lunch taimen-[user|userdebug|eng] && make droid

Inspected:
ls -l out/target/product/taimen/system/usr/icu

Bug: 128249030
Bug: 122985829
Bug: 124106384
Test: see above
Merged-In: I92a52d0b5ef97e8cb4f780691f8594e40f2fa6b3
Change-Id: I92a52d0b5ef97e8cb4f780691f8594e40f2fa6b3
(cherry picked from commit 0ed52b789d)
2019-03-14 10:38:54 +00:00
Neil Fuller
cd29f37e39 Merge "Move the logic for creating APEX-related symlinks" 2019-03-14 08:54:33 +00:00
David Anderson
808aac632e Merge "libfiemap_writer: Fix the progress bar on VFAT partitions." am: ed5d1ca252 am: 90b78c6d0d
am: 44f54e0343

Change-Id: Id61a03b59cd506b15b37f985314ac4f747570a23
2019-03-13 19:10:05 -07:00
David Anderson
44f54e0343 Merge "libfiemap_writer: Fix the progress bar on VFAT partitions." am: ed5d1ca252
am: 90b78c6d0d

Change-Id: Iec44588fee1210fc0101ca5ad051135f9b974e02
2019-03-13 19:05:54 -07:00
David Anderson
90b78c6d0d Merge "libfiemap_writer: Fix the progress bar on VFAT partitions."
am: ed5d1ca252

Change-Id: Ic7fea9196b809953048e5bf5fe037baa9c26fd4c
2019-03-13 19:01:45 -07:00
David Anderson
ed5d1ca252 Merge "libfiemap_writer: Fix the progress bar on VFAT partitions." 2019-03-14 01:51:27 +00:00
Elliott Hughes
37fbb17684 Merge "run-as: improve diagnostics on failure." am: e5de6db1dd am: bfe0513107
am: ca41e88529

Change-Id: I0b7736485a21e69d58ab262993132599ee261628
2019-03-13 17:45:49 -07:00
Elliott Hughes
ca41e88529 Merge "run-as: improve diagnostics on failure." am: e5de6db1dd
am: bfe0513107

Change-Id: Id1fe5e5951df93f37dc39fa0c80a69ff603cbfd7
2019-03-13 17:41:39 -07:00
Elliott Hughes
bfe0513107 Merge "run-as: improve diagnostics on failure."
am: e5de6db1dd

Change-Id: I61e98d37cdff9ce9b65820e773c17e9a62c9084a
2019-03-13 17:37:26 -07:00
Elliott Hughes
e5de6db1dd Merge "run-as: improve diagnostics on failure." 2019-03-14 00:26:32 +00:00
Christopher Ferris
02a6c448c3 Add support for displaying soname in an apk.
Changes:
- Change GetSoname to always returns a std::string.
- Added new unit tests for the soname printing.
- Modify the GetElf() function to save the same elf when we see rosegment
  linkers that split the read-only and read-write across a map. This
  avoids creating multiple elf objects for each map.
- Fixed a few offline unwind tests.

Bug: 29218999

Test: Unit tests pass.
Change-Id: Iad7c38b5c2957a8c5fd4ba94ebec335bafcad57d
2019-03-13 17:07:46 -07:00
Mark Salyzyn
37bbf800fa init: epoll: add events argument to RegisterHandler
Allow caller to specify events other than EPOLLIN default.

Test: boot
Bug: 124072565
Change-Id: Id4e582a6abc74c5fdb26fea7dcbd3ba2150dadd6
2019-03-13 16:51:31 -07:00
Tim Murray
2204bf50b8 Merge "lmkd: set PSI_POLL_PERIOD to 40ms" am: 92dcfb3187 am: 90cfb547d2
am: 8f66fc9000

Change-Id: I66d8ed75fb820edcd369e17eee4c83056edbea64
2019-03-13 16:43:58 -07:00
Tim Murray
8f66fc9000 Merge "lmkd: set PSI_POLL_PERIOD to 40ms" am: 92dcfb3187
am: 90cfb547d2

Change-Id: I3bcad580bb095c186d990de98723ec78463ba2d4
2019-03-13 16:39:49 -07:00
Tim Murray
90cfb547d2 Merge "lmkd: set PSI_POLL_PERIOD to 40ms"
am: 92dcfb3187

Change-Id: Ib8d6a2dc535e9cccad95c790da9454d5550b4cd2
2019-03-13 16:35:39 -07:00
Tim Murray
92dcfb3187 Merge "lmkd: set PSI_POLL_PERIOD to 40ms" 2019-03-13 23:27:13 +00:00
David Anderson
5df0092353 libfiemap_writer: Fix the progress bar on VFAT partitions.
We allocate VFAT file space by seeking and writing a single byte. It
turns out this is not fast enough to avoid invoking the progress
callback, so instead, we should seek in increments.

Bug: 126230649
Test: fiemap_writer_test gtest
Change-Id: I2b363af4ebde873411e8a3acd22ca68d175afe3f
2019-03-13 13:58:12 -07:00
Hans Boehm
6e75ad6e13 Revert "Revert "Fix wp and sp comparison bugs""
Fix wp and sp comparison bugs

Make clear() actually clear wp m_refs, so that nulls compare equal.

Make equality consistent with < and >, ensuring that a weak pointer
cannot be both equal to and greater than another.

Don't rely on the built-in < and > operators to correctly order
different objects. The standard does not guarantee that, and there is
a risk of compiler relying on that lack of guarantee.

Remove unnecessary comparison overloads, especially those
comparing a wp<> to an sp<>.

Change the remaining wp<> to sp<> comparisons to check for equivalence
of the mRefs pointer instead of the object address, thus eliminating
the dubious equal comparison result for a dead wp<> and an sp<> that
happen to point to the same object address.

Add comparison tests.

This reverts commit a2a2ad8057.

The original code, and my original CL, both failed to initialize m_refs
in various wp<> constructors. This now became more important, since
comparisons now rely more on m_refs. However I believe it was always
a bug, since some comparisons always relied on m_refs.

Test: Treehugger, boot AOSP, atest RefBase
Bug: 126922090
This reverts commit a2a2ad8057.

Reason for revert: Reapply after constructor fixes.

Change-Id: I2c8917416a2306e36d2b6bb7b397f653020e5688
2019-03-13 13:26:35 -07:00
Christopher Ferris
681d746bd8 Merge "Fix missing offset for apk." am: 9a00f596d3 am: fb3535ea56
am: 7255c42dda

Change-Id: I1f0f423f12df722f8cb0f059437e95953e4a1518
2019-03-13 11:49:27 -07:00
Christopher Ferris
7255c42dda Merge "Fix missing offset for apk." am: 9a00f596d3
am: fb3535ea56

Change-Id: I41350b9fa79b6ef2df701344459133adf1507059
2019-03-13 11:37:26 -07:00
Christopher Ferris
fb3535ea56 Merge "Fix missing offset for apk."
am: 9a00f596d3

Change-Id: Ie4a9074591aef5869479dc6f872bff8ae1d54dee
2019-03-13 11:31:40 -07:00
Christopher Ferris
9a00f596d3 Merge "Fix missing offset for apk." 2019-03-13 18:16:05 +00:00
Elliott Hughes
964932d7ce run-as: improve diagnostics on failure.
Bug: http://b/128523258
Test: manual
Change-Id: I4430a8d309c0e9b5315aaae3e7d223c05b7ea3e5
2019-03-13 11:16:03 -07:00
Neil Fuller
0ed52b789d Move the logic for creating APEX-related symlinks
The existing location of logic for creating symlinks to files that have
moved into APEX does not get executed for -user builds, only
-userdebug and -eng. The new location is equally arbitrary but appears
to be invoked for -user, -userdebug and -eng targets.

Tested with:
make cleaninstall && lunch taimen-[user|userdebug|eng] && make droid

Inspected:
ls -l out/target/product/taimen/system/usr/icu

Bug: 128249030
Bug: 122985829
Bug: 124106384
Test: see above
Change-Id: I92a52d0b5ef97e8cb4f780691f8594e40f2fa6b3
2019-03-13 18:14:56 +00:00
Tim Murray
0e5c00f375 lmkd: set PSI_POLL_PERIOD to 40ms
200ms was too lenient when under severe memory pressure.

Test: boots, works
Bug: 127765309

Change-Id: I8e047de6318574a107720c56473ed0f25582e182
Signed-off-by: Tim Murray <timmurray@google.com>
2019-03-13 10:13:19 -07:00
Roland Levillain
3f3e2c678e Remove Valgrind entries from fs_config.
Valgrind has been removed from the Android tree in 2018.

Test: n/a
Bug: 77856586
Change-Id: I3b51d9b2290a4276299725cdd5a53a5bba00166e
2019-03-13 17:12:00 +00:00