Commit graph

34195 commits

Author SHA1 Message Date
Treehugger Robot
48d610ab18 Merge "Remove reference to deleted gzip module" 2017-07-07 01:34:40 +00:00
Colin Cross
b9e74ba400 Add test config for memunreachable_test
Test: none
Change-Id: Ieb297a2fcece6365a074cd470b3ca56e2baea926
2017-07-07 01:07:05 +00:00
Android Build Merger (Role)
bb3d4e579c Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 2017-07-06 23:51:55 +00:00
Android Build Merger (Role)
b3341eef52 Merge "Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master am: b3c418e847" into oc-dev-plus-aosp 2017-07-06 23:51:34 +00:00
Steven Moreland
18114a6493 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
am: b3c418e847

Change-Id: Ie9fa17a1f77b03687e626754291b6997856183ce
2017-07-06 23:51:26 +00:00
Steven Moreland
2ae838ed16 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master
am: b3c418e847

Change-Id: If5bf35ad8fd29c3cec6ecb9b9cb882fa86647053
2017-07-06 23:51:07 +00:00
Android Build Merger (Role)
7f895b1438 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34 am: 1921ab7c0e" into oc-dev-plus-aosp 2017-07-06 23:51:02 +00:00
Steven Moreland
a947566568 Merge "Move libnativebridge headers into the module." am: 508e0b8b34
am: 1921ab7c0e

Change-Id: Ia1e83633a2b28a7fc15f96aaca31b57fcd183c3f
2017-07-06 23:50:33 +00:00
Steven Moreland
d46cb65ce4 Merge "Move libnativebridge headers into the module." am: 508e0b8b34
am: 1921ab7c0e

Change-Id: I3d72c2338d0ad627ef1a1a639c3cc0700e2302fe
2017-07-06 23:50:18 +00:00
Android Build Merger (Role)
b3c418e847 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master 2017-07-06 23:47:59 +00:00
Steven Moreland
a931c8aee5 Merge "Move libnativebridge headers into the module."
am: 508e0b8b34

Change-Id: Ifb3e84ed0a059f10efe8e25595387a17c2b0ed46
2017-07-06 23:47:31 +00:00
Steven Moreland
1921ab7c0e Merge "Move libnativebridge headers into the module."
am: 508e0b8b34

Change-Id: I9135de5cbda05c9b4b686b0c6dda26c2d561d31e
2017-07-06 23:46:57 +00:00
Treehugger Robot
508e0b8b34 Merge "Move libnativebridge headers into the module." 2017-07-06 23:36:34 +00:00
Andreas Gampe
19fc21698b Merge "System/core: Remove include/ziparchive" am: ae590fe723
am: 10e80f3715

Change-Id: I585cb91604498e4b19d3706c231e586ffb1b5a10
2017-07-06 23:10:24 +00:00
Steven Moreland
58b3c79034 libutils: liblog export headers
- make liblog dependency for all library builds (this is required
    for files like String8.cpp)
- export liblog headers (because they are used in many header files).

Test: less libraries fail with BOARD_VNDK_VERSION := current
Merged-In: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
Change-Id: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
2017-07-06 22:57:08 +00:00
Andreas Gampe
10e80f3715 Merge "System/core: Remove include/ziparchive"
am: ae590fe723

Change-Id: I396b3cd0e642b3d65a1e0771a4ed8aec64128922
2017-07-06 22:56:34 +00:00
Treehugger Robot
ae590fe723 Merge "System/core: Remove include/ziparchive" 2017-07-06 22:42:39 +00:00
Colin Cross
73c2ef4b87 Remove reference to deleted gzip module
The gzip module was removed and replaced with an implementation in
toybox.  Remove the required modules reference.

Bug: 63400769
Change-Id: I032d7ddc59105b3c6fb87084983266655772756a
Test: m -j checkbuild
2017-07-06 22:33:22 +00:00
Eric Biggers
e9811f36e5 fs_mgr: set ext4 encryption flag with tune2fs when needed
Upstream kernels (v4.9+, v4.4.67+) have started to enforce that
encryption policies cannot be set on ext4 directories unless
EXT4_FEATURE_INCOMPAT_ENCRYPT is set in the filesystem superblock, as
was the original design.  Since Android's userspace was not setting this
flag, it was not possible to use "file-based encryption" (FBE) on
devices whose kernels enforce this constraint.  Fix this by updating
fs_mgr to set the flag if needed, similar to how it enables the quota
feature if needed.

Note that it would, eventually, be simpler to set this flag at mkfs
time.  But that seems infeasible for now, given the many different ways
the userdata filesystem can be formatted --- including via 'fastboot',
which I believe is expected to still be compatible with old devices
whose kernel and/or e2fsprogs don't support the 'encrypt' flag.

Bug: 36231741
Change-Id: Ibafb9a7116fc853b62f8ee074a78499399f290a6
2017-07-06 13:31:30 -07:00
Eric Biggers
8d3bcd4b6a fs_mgr: refactor pre-mount logic into prepare_fs_for_mount()
There were several duplications in the code that runs before a
filesystem is mounted.  This made it difficult to start running tune2fs
to set the encryption feature flag.  Refactor to deduplicate the logic,
and improve the log messages.

Bug: 36231741
Change-Id: I90846dad9c5ec85b3c5460615dec4cc19cb7e198
2017-07-06 13:31:30 -07:00
Steven Moreland
b2b88e35ea Move libnativebridge headers into the module.
Test: links
Change-Id: I2e19d1ba7845b4b3d3fee934fcb1c90151fd7192
2017-07-06 11:23:16 -07:00
Andreas Gampe
417556a5f8 Merge "Libziparchive: Export headers in defaults" am: c31963b5c2
am: bf4029cdfb

Change-Id: I9f992d57fd65f341247b02a20d761a1863376fa4
2017-07-06 07:00:13 +00:00
Andreas Gampe
bf4029cdfb Merge "Libziparchive: Export headers in defaults"
am: c31963b5c2

Change-Id: Ic57c6374d94828d245b3e89ea6ec669707e32262
2017-07-06 06:57:06 +00:00
Treehugger Robot
c31963b5c2 Merge "Libziparchive: Export headers in defaults" 2017-07-06 06:51:29 +00:00
Andreas Gampe
d201b292fd System/core: Remove include/ziparchive
Remove the now unnecessary link.

Partially reverts commit cdf7ff8e20.

Bug: 37342627
Test: m
Change-Id: Ia44df234923c798618d7dc79d8f9f9432fbfada9
2017-07-05 22:03:44 -07:00
Andreas Gampe
a10a7e7114 Libziparchive: Export headers in defaults
libziparchive-host needs to include the headers correctly, too.

Bug: 37342627
Test: mmma system/core/libziparchive
Change-Id: I88a6d38ff9e494273040f9b913c71bccdda117ad
2017-07-05 22:03:44 -07:00
Tom Cherry
7b600f8012 Merge "init: add info logs in first stage mount if we have to poll" am: 6a9d56775f
am: 11d5611ba5

Change-Id: Ib08ea62f6fb13cfaed6bc894bcbc548ccd8c3d55
2017-07-06 04:51:08 +00:00
Tom Cherry
11d5611ba5 Merge "init: add info logs in first stage mount if we have to poll"
am: 6a9d56775f

Change-Id: I7948db4cf1d6af6f4e6d0ddb2a2788f62317126f
2017-07-06 04:48:38 +00:00
Treehugger Robot
6a9d56775f Merge "init: add info logs in first stage mount if we have to poll" 2017-07-06 04:46:05 +00:00
Jinguang Dong
0ac18b28cd Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368
am: 694985721f

Change-Id: I86f7cf743e1e9f2466eb7675ebc1de61ae9ab3ec
2017-07-06 04:22:08 +00:00
Jinguang Dong
694985721f Merge "fs_mgr: Adding logs when failing to wait for a device file"
am: 4ca2a30368

Change-Id: I19ba38a596527a4544437d126c80123381b065b4
2017-07-06 04:20:55 +00:00
Treehugger Robot
4ca2a30368 Merge "fs_mgr: Adding logs when failing to wait for a device file" 2017-07-06 04:19:00 +00:00
Tom Cherry
177fec0899 Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master
am: 3752ae8474

Change-Id: Id88c3f665131cafd5d7d3d8fc0159997d92130f0
2017-07-06 02:23:20 +00:00
Android Build Merger (Role)
1a4bc908f2 Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a am: e944b7e0a4" into oc-dev-plus-aosp 2017-07-06 02:21:45 +00:00
Tom Cherry
290b501bc0 Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
am: e944b7e0a4

Change-Id: I530a79b39eefddcf398932a90dfd0059bf8a096e
2017-07-06 02:21:34 +00:00
Tom Cherry
1eee2122ca Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a
am: e944b7e0a4

Change-Id: Ifc8c586aa3b06ecb42bf20284c461b4b7c159bc7
2017-07-06 02:21:26 +00:00
Android Build Merger (Role)
3752ae8474 Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master 2017-07-06 02:11:15 +00:00
Tom Cherry
1f30993247 Merge "ueventd: don't double fork firmware handlers"
am: 0f4fb5497a

Change-Id: I4a5957d18e3a934213170279f59b3ec8c0f85090
2017-07-06 02:11:03 +00:00
Tom Cherry
e944b7e0a4 Merge "ueventd: don't double fork firmware handlers"
am: 0f4fb5497a

Change-Id: I2a40b76e937853fd2f1eed61cc0fe4f6fa465ba2
2017-07-06 02:10:57 +00:00
Tom Cherry
0f4fb5497a Merge "ueventd: don't double fork firmware handlers" 2017-07-06 02:02:33 +00:00
Jinguang Dong
9d344969b0 fs_mgr: Adding logs when failing to wait for a device file
During mount operations, fs_mgr_wait_for_file() is invoked to
ensure the device file exists before starting to mount it. Adding
logs when the wait fails and also skip mounting as it won't be
successful. Also merge fs_mgr_test_access() and wait_for_file()
as fs_mgr_wait_for_file().

Test: Boot device and manually trigger the timeout issue
Test: Check and confirm whether timeout log info is inside ksmg.

Change-Id: Ide6d7fdca41e03e169e4400f91b7dea327985aaf
2017-07-06 09:51:02 +08:00
Android Build Merger (Role)
61ce9b3bad Merge "Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328" into oc-dev-plus-aosp 2017-07-06 00:57:11 +00:00
Keun-young Park
2fb50a7394 Merge "add "shutdown critical" to service" am: b3915d113d
am: a4ad5d0328

Change-Id: Ib31dd492ab1dba53c6cdaf70e24c7c3a93f21c21
2017-07-06 00:56:58 +00:00
Keun-young Park
19ec8e7bcf Merge "add "shutdown critical" to service" am: b3915d113d
am: a4ad5d0328

Change-Id: I6467657616371e84468975e56ac086855a298efb
2017-07-06 00:56:18 +00:00
Bowgo Tsai
06c6bf67e9 Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962
am: 328b56585e

Change-Id: Ib8602958bffa7061a11ca4450b3dfdaf462b63f6
2017-07-06 00:56:00 +00:00
Keun-young Park
a4ad5d0328 Merge "add "shutdown critical" to service"
am: b3915d113d

Change-Id: I25b6f42478efda7077e00141042a427245393d28
2017-07-06 00:46:31 +00:00
Bowgo Tsai
328b56585e Merge "fs_mgr: allow no verity metadata when the device is unlocked."
am: cd0c2d8962

Change-Id: Icebfb3c34b3c2878c4015f36dafe893c577b40c9
2017-07-06 00:46:09 +00:00
Treehugger Robot
b3915d113d Merge "add "shutdown critical" to service" 2017-07-06 00:40:55 +00:00
Treehugger Robot
cd0c2d8962 Merge "fs_mgr: allow no verity metadata when the device is unlocked." 2017-07-06 00:29:47 +00:00
Andreas Gampe
0e6bac40c4 Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe
am: 1030828a36

Change-Id: I875b3b43c0aeb19aa2b975da652dba12e4d0f713
2017-07-06 00:00:50 +00:00