Commit graph

56799 commits

Author SHA1 Message Date
Ruchir Rastogi
7070b7ac74 Merge libstatspush_compat and libstatssocket_q
This cleanup makes it clear that there are only two acceptable ways of
logging to the socket: either through libstatspush_compat or
libstatssocket (which will soon be renamed to libstatspush).

Test: m -j
Change-Id: I6a49b4995b56df462e1be901ea5e54acfe2e8bac
2019-12-16 15:24:36 -08:00
Automerger Merge Worker
714e50df19 Merge "Rename unzip.cpp to ziptool.cpp." am: cd652ea3dc am: 8025cee478 am: 8015670751
Change-Id: I34ebe463e0a116f7a002576054b9a2205cd05414
2019-12-16 19:07:20 +00:00
Automerger Merge Worker
8015670751 Merge "Rename unzip.cpp to ziptool.cpp." am: cd652ea3dc am: 8025cee478
Change-Id: I785ee3029bf7c34a63cd48b56ebf977773543e26
2019-12-16 18:55:34 +00:00
Elliott Hughes
8025cee478 Merge "Rename unzip.cpp to ziptool.cpp."
am: cd652ea3dc

Change-Id: Icefb783e8da17a4c985b6fef02d3c124d9e7892d
2019-12-16 10:41:05 -08:00
Treehugger Robot
cd652ea3dc Merge "Rename unzip.cpp to ziptool.cpp." 2019-12-16 18:37:49 +00:00
Automerger Merge Worker
4fbc6031c5 Merge "liblp: Expand the metadata header for future use." am: 18bb214b3f am: c229e1facc am: bbfee99e60
Change-Id: Ic2ede7538630e2f5318b545e15265dd3f91dbdfe
2019-12-16 18:04:44 +00:00
Automerger Merge Worker
bbfee99e60 Merge "liblp: Expand the metadata header for future use." am: 18bb214b3f am: c229e1facc
Change-Id: I8db97450adb46cfca6bf1866c3fef79cb5fb8f73
2019-12-16 17:53:34 +00:00
David Anderson
c229e1facc Merge "liblp: Expand the metadata header for future use."
am: 18bb214b3f

Change-Id: Ica89f0a30ce180e168f98937472daaee6c4933f8
2019-12-16 09:42:03 -08:00
David Anderson
18bb214b3f Merge "liblp: Expand the metadata header for future use." 2019-12-16 17:31:57 +00:00
Automerger Merge Worker
6c63fa2e1f Merge "Use apex name in apex_manifest.pb as the mount point" am: 413440c5b9 am: 0d8d920e1d am: 33db956877
Change-Id: Iabe47ac500578f45fc16a64392a86c768369626b
2019-12-16 15:30:00 +00:00
Automerger Merge Worker
33db956877 Merge "Use apex name in apex_manifest.pb as the mount point" am: 413440c5b9 am: 0d8d920e1d
Change-Id: I8588261d05a44b1e23d9a68a7a334993f5e4f83b
2019-12-16 15:18:20 +00:00
Jiyong Park
0d8d920e1d Merge "Use apex name in apex_manifest.pb as the mount point"
am: 413440c5b9

Change-Id: I46cc8c9cb168538bf9408a515725a0715f35fba5
2019-12-16 06:57:37 -08:00
Treehugger Robot
413440c5b9 Merge "Use apex name in apex_manifest.pb as the mount point" 2019-12-16 14:48:03 +00:00
Jiyong Park
648ae3a9d3 Use apex name in apex_manifest.pb as the mount point
When bind-mounting flattened APEX, use the apex name found in
apex_manifest.pb as the mount point, instead of the directory name which
might be different from apex name in case when the apex is overridden.

This allowed us to remove the special casing for the ART apex since we
/system/apex/com.android.art.release will be mounted to
/apex/com.android.art instead of /apex/com.android.art.release.

Bug: N/A
Test: m
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m, device is bootable
Change-Id: Ibdde7002b9078db390e6672b0eb82c474925451d
2019-12-16 11:31:50 +09:00
Automerger Merge Worker
8df00406b1 Merge "Have /storage always point to sdcardfs by default." am: a587d69364 am: 74b049c172 am: 9e767e74c1
Change-Id: Idaa68b59aad030203e06c26437f430effa6d4881
2019-12-14 12:35:33 +00:00
Automerger Merge Worker
9e767e74c1 Merge "Have /storage always point to sdcardfs by default." am: a587d69364 am: 74b049c172
Change-Id: If15e32c3edaa52e8cccb1a46e230c7ae0cdc39fe
2019-12-14 12:16:23 +00:00
Martijn Coenen
74b049c172 Merge "Have /storage always point to sdcardfs by default."
am: a587d69364

Change-Id: I730e04651fce8267176b577622bfe0b821ebd8c9
2019-12-14 02:02:53 -08:00
Martijn Coenen
a587d69364 Merge "Have /storage always point to sdcardfs by default." 2019-12-14 09:19:03 +00:00
Automerger Merge Worker
f5fe7228ed Merge "libsnapshot: snaity check overflow bit at the end of update" am: babc293140 am: f99af924e5 am: 44be680d3f
Change-Id: I3de707592077e8ee1aef26621e5c36df067a307d
2019-12-14 03:33:51 +00:00
Automerger Merge Worker
44be680d3f Merge "libsnapshot: snaity check overflow bit at the end of update" am: babc293140 am: f99af924e5
Change-Id: I06bf91746f3baffd82d10a6a6b414df34635bfd0
2019-12-14 03:20:17 +00:00
Yifan Hong
f99af924e5 Merge "libsnapshot: snaity check overflow bit at the end of update"
am: babc293140

Change-Id: Ica15033799b3af1f226d7e784f8781d0c9b03907
2019-12-13 19:07:32 -08:00
Treehugger Robot
babc293140 Merge "libsnapshot: snaity check overflow bit at the end of update" 2019-12-14 03:05:19 +00:00
Automerger Merge Worker
62c3e309fd Merge "adb: improve help for -t/-tt." am: 7f5116e581 am: 98e1c94816 am: 9986750f5e
Change-Id: I9bf2416bf2c540c55362d348bbef7fb44757ffb1
2019-12-14 02:58:05 +00:00
Automerger Merge Worker
9986750f5e Merge "adb: improve help for -t/-tt." am: 7f5116e581 am: 98e1c94816
Change-Id: I9ff2cc1acc5fbe74de3f9c2ae6f1e8321b2520aa
2019-12-14 02:45:10 +00:00
Elliott Hughes
98e1c94816 Merge "adb: improve help for -t/-tt."
am: 7f5116e581

Change-Id: Iacf553efedda8a82741de88a8a05d1dd56126bb7
2019-12-13 18:35:28 -08:00
Treehugger Robot
7f5116e581 Merge "adb: improve help for -t/-tt." 2019-12-14 02:26:36 +00:00
Ruchir Rastogi
234846a284 Merge "Improve stats_event memory usage" 2019-12-14 01:17:47 +00:00
Automerger Merge Worker
7cd0b7a6f7 Merge "cli-test: a tool for testing command-line programs." am: 5a07ae1422 am: 96f8267eff am: 4e0d5989f6
Change-Id: I7274d9f71ce0bc5457598a236bab48892a94d0df
2019-12-14 01:10:17 +00:00
Automerger Merge Worker
4e0d5989f6 Merge "cli-test: a tool for testing command-line programs." am: 5a07ae1422 am: 96f8267eff
Change-Id: Icee24a4218e8791b2ea6cdd4a297f35873afab29
2019-12-14 00:58:25 +00:00
Elliott Hughes
96f8267eff Merge "cli-test: a tool for testing command-line programs."
am: 5a07ae1422

Change-Id: Icbbe56a2ce8dee311bc6310840bb0bffe6063643
2019-12-13 16:47:31 -08:00
Elliott Hughes
8748bcc650 Rename unzip.cpp to ziptool.cpp.
It contains unzip and zipinfo, and will likely contain zip too soon.

Test: builds
Change-Id: I017df302108847f29bfdd120f20bf0fd3b9caa5b
2019-12-13 16:47:22 -08:00
Elliott Hughes
dfe6c84709 adb: improve help for -t/-tt.
Test: adb help
Change-Id: Ic75bf184dfc51e57b422666d85e3b7a5139b3853
2019-12-13 16:43:10 -08:00
Elliott Hughes
5a07ae1422 Merge "cli-test: a tool for testing command-line programs." 2019-12-14 00:41:04 +00:00
David Anderson
9f75098c60 liblp: Expand the metadata header for future use.
A few times we have wanted to stash small bits of information in the
super header, but we haven't had any bits to do so. This patch addresses
future needs in two ways:

  1. A "flags" field has been added for miscellanious bits that do not
     need a version bump.
  2. The header struct has been padded to 256 bytes to allow for future
     expansion without complicating the struct-parsing code.

This is the first time we've materially changed the format, so this
patch needs some extra explanation.

In all the places we rely on sizeof(LpMetadataHeader), we now need to
use the |header_size| field instead. To make newer versions of liblp
compatible with older headers, we read the minimum required header size
and fill in the extra bytes as needed. To make the validation and
reading logic more clear, it is now combined into a single function,
ReadMetdataHeader.

MetadataBuilder will still emit 1.0-compatible headers, to avoid
changing the on-disk format of existing devices. The new header will
only be emitted as-needed.

Bug: 134949511
Test: liblp_test gtest
      retrofit DAP device boots
      launch DAP device boots

Change-Id: I6221123768ff0057a73967ecb2ff9b006c17af88
2019-12-14 00:35:58 +00:00
Ruchir Rastogi
f104eb94be Improve stats_event memory usage
We now truncate the buffer to the appropriate length when clients call
stats_event_build().

Benchmarking tests indicate that truncating the buffer to the
appropriate length increases the cost clients pay to write to the socket
by 2%. This is negligible enough that I decided to truncate the buffer
for both pushed and pulled atoms in order to simplify the API.

Test: m libstatssocket
Test: bit libstatssocket_benchmark:*
Bug: 144126231
Change-Id: Ife976bb383ecff8de5064730692a95e2a3a82c9d
2019-12-13 23:38:19 +00:00
Automerger Merge Worker
0c409e11c3 Merge "Copy necessary ipt_ULOG.h structure to source." am: 0231f4fc38 am: f39c7b6a0e am: 1d18aa89ea
Change-Id: I9c1eab4a15a1e4ea207563357f5ebb314dd724eb
2019-12-13 22:19:07 +00:00
Automerger Merge Worker
78858021ac Merge changes I9d94e252,If4a543d3,I0af7cda9 am: 799f55fb01 am: f3a96243c9 am: 5d5b85557a
Change-Id: I712e054a11d886405043442f2205ff8167af0008
2019-12-13 22:14:16 +00:00
Automerger Merge Worker
1d18aa89ea Merge "Copy necessary ipt_ULOG.h structure to source." am: 0231f4fc38 am: f39c7b6a0e
Change-Id: Ibeb5c80cc1cf7e6eb2758f6b4f2e4721bbc9b4b7
2019-12-13 22:05:44 +00:00
TreeHugger Robot
c9b826c66b Merge "StatsEventCompat" 2019-12-13 21:57:34 +00:00
Automerger Merge Worker
5d5b85557a Merge changes I9d94e252,If4a543d3,I0af7cda9 am: 799f55fb01 am: f3a96243c9
Change-Id: I0c0ea02f592fba22e54fdbeb3854684570032299
2019-12-13 21:56:36 +00:00
Christopher Ferris
f39c7b6a0e Merge "Copy necessary ipt_ULOG.h structure to source."
am: 0231f4fc38

Change-Id: I64020cf4bd9bb51eeba30ae199ea068b268e1cb0
2019-12-13 13:49:55 -08:00
Christopher Ferris
0231f4fc38 Merge "Copy necessary ipt_ULOG.h structure to source." 2019-12-13 21:39:54 +00:00
David Anderson
f3a96243c9 Merge changes I9d94e252,If4a543d3,I0af7cda9
am: 799f55fb01

Change-Id: I481ba55fa66de2482286ed5f5a9c4651a99cb273
2019-12-13 13:32:21 -08:00
David Anderson
799f55fb01 Merge changes I9d94e252,If4a543d3,I0af7cda9
* changes:
  remount: Remove fs_mgr_overlayfs_scratch_device()
  remount: Refactor fs_mgr_overlayfs_teardown
  remount: Do not run the create-scratch logic on older devices.
2019-12-13 21:00:21 +00:00
Elliott Hughes
f276140d0f cli-test: a tool for testing command-line programs.
Not looking for other users right now, this is just enough to test
unzip/zip/zipinfo.

This includes tests for unzip and ziptool, along with a change to
unzip's behavior to fix AOSP `make dist` when using ziptool unzip.

Also add the boilerplate to run these tests on the device, in presubmit.

Fix command name in --help output.

Test: atest ziptool-tests
Change-Id: I5c0215a3ab8cb2cd5fc517ed9c188f81a7bf4520
2019-12-13 12:23:51 -08:00
Ruchir Rastogi
8822a0208f StatsEventCompat
StatsEventCompat is a wrapper library that toggles between the old
logging scheme and the new logging scheme. It was designed particularly
for the DNS Resolver module and should not be used by others.

We will merge libstatspush_compat and libstatssocket_q in a future CL.

Test: m libstatspush_compat
Test: bit libstatspush_compat_test:* (passes on Q and R)
Bug: 145534143

Change-Id: Idf35ccb6669798166475f08b2fbab40534b5db19
2019-12-13 12:03:03 -08:00
Automerger Merge Worker
578865d1e3 Merge changes If7fa11e7,I345c9a5d am: a5a6c0a0bc am: 7163fb158c am: 53038322a7
Change-Id: I9f0dec21da4fc728be9a760f6ed22a8399b67bb9
2019-12-13 16:32:00 +00:00
Automerger Merge Worker
53038322a7 Merge changes If7fa11e7,I345c9a5d am: a5a6c0a0bc am: 7163fb158c
Change-Id: Ic4801436f6e2466e267371256cef14b9b638eeae
2019-12-13 16:11:33 +00:00
Tom Cherry
7163fb158c Merge changes If7fa11e7,I345c9a5d
am: a5a6c0a0bc

Change-Id: I9d8514ff1aefc0a7650e3e5b06021a127f5149c5
2019-12-13 07:59:22 -08:00
Martijn Coenen
5d53bfce2d Have /storage always point to sdcardfs by default.
This is a partial revert of change
Idf851b3a42910e0ce8fdd75daea1cce91dd1aa98, and brings us back to the
state we shipped in Q.

The default behavior for now is that we want native daemons to use the
default sdcardfs view, as they did before. Zygote-spawned apps will then
get the correct view assigned to them as they get spawned.

Bug: 146189163
Test: atest AdoptableHostTest
Change-Id: I2248f39e029138962a41a6ead944431414c901ad
2019-12-13 16:52:11 +01:00