Commit graph

44605 commits

Author SHA1 Message Date
Vic Yang
23f714a52f Merge "Move DwarfCfaInfo::kTable from data.rel.ro to rodata"
am: a7d2ffa821

Change-Id: I92dcdb99598bc2b5ffee8d4076ddc8beea99109b
2018-12-21 05:06:58 -08:00
Treehugger Robot
a7d2ffa821 Merge "Move DwarfCfaInfo::kTable from data.rel.ro to rodata" 2018-12-21 12:58:26 +00:00
David Anderson
009dd524fb Merge "init: Don't fail first stage mount for formattable partitions."
am: bcede5f61a

Change-Id: Id77282333c9608a844d2470e100d686f62ae8c95
2018-12-21 00:07:23 -08:00
David Anderson
5f8e0d9055 Merge "fastbootd: Better error message when boot_devices is missing."
am: 00dc20701a

Change-Id: I5a5297e2380a7b257590e2db5eb3fac620d3e44f
2018-12-21 00:06:48 -08:00
David Anderson
bcede5f61a Merge "init: Don't fail first stage mount for formattable partitions." 2018-12-21 07:52:42 +00:00
David Anderson
00dc20701a Merge "fastbootd: Better error message when boot_devices is missing." 2018-12-21 07:52:19 +00:00
Alex Buynytskyy
417119922f Merge "Minor refactor to support strings with embedded zeros."
am: db2ffaa0f0

Change-Id: I849a3d8b50d1a170e08b413e2d806d25b178cdf7
2018-12-20 17:10:50 -08:00
Treehugger Robot
db2ffaa0f0 Merge "Minor refactor to support strings with embedded zeros." 2018-12-21 00:59:48 +00:00
David Anderson
a48f86b88e fastbootd: Better error message when boot_devices is missing.
Bug: 121333158
Test: N/A
Change-Id: Ifac7ae382d9e57864f6a3915987300eb91355293
2018-12-20 16:56:06 -08:00
David Anderson
a1bb982c01 init: Don't fail first stage mount for formattable partitions.
If a partition can be formatted by vold, then it doesn't make sense to
have first-stage mount fail if the partition hasn't been formatted yet.

Bug: 121209697
Test: device boots after fastboot flashall -w
Change-Id: I4a6c794a9912a5e0794983e9514a08f9c23e6ae9
2018-12-20 16:30:40 -08:00
Sandeep Patil
cc925d6662 Merge "Remove unnecessary warning suppression from libdm."
am: b0b0f62ced

Change-Id: I1aae917fcc3aa8afb5ceda8b81565acb2bb9c472
2018-12-20 15:20:44 -08:00
Treehugger Robot
b0b0f62ced Merge "Remove unnecessary warning suppression from libdm." 2018-12-20 23:15:16 +00:00
Sandeep Patil
679c728752 Merge "Add librank2"
am: 713398f8bf

Change-Id: Ife31e37041cec494dcef0b335cc118918437b0ae
2018-12-20 14:06:51 -08:00
Treehugger Robot
713398f8bf Merge "Add librank2" 2018-12-20 21:58:49 +00:00
Tom Cherry
5fd9d37fc5 Merge "improve LogBufferElement copy constructor"
am: b5a5c31093

Change-Id: I65f25dbe39828277a037953aec69d1bafd25b0d8
2018-12-20 10:14:32 -08:00
Alex Buynytskyy
a9e79489dc Minor refactor to support strings with embedded zeros.
Test: manual
Change-Id: Iaece3003deb257cbcae65a23a4c4a1ccfd690d49
2018-12-20 10:11:15 -08:00
Tom Cherry
b5a5c31093 Merge "improve LogBufferElement copy constructor" 2018-12-20 18:03:59 +00:00
Sandeep Patil
e9f8eb46e3 Remove unnecessary warning suppression from libdm.
Fixes: 110035986
Test:  mma -j builds without errors or warnings

Change-Id: Id00f844ad75c3ee2ebb9f47eebc7976bc40bdf59
Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-12-20 09:31:05 -08:00
Dario Freni
3cde91620f Merge "Create staging directory for Staging Manager."
am: d1ff11b94a

Change-Id: I46ebcd0b093256d5c599010b70a5aa26cd806a53
2018-12-20 09:24:50 -08:00
Treehugger Robot
d1ff11b94a Merge "Create staging directory for Staging Manager." 2018-12-20 17:10:25 +00:00
Sandeep Patil
2aeaaebc49 Add librank2
Identical with librank, but written using libmeminfo.

Bug: 114325007
Bug: 111694435
Test: librank2
Test: librank2 -m rx
Test: librank2 -m rx -P /system/lib64
Test: librank2 -u -P /system/lib
Test: librank2 -R -m rx

Change-Id: Ib6ecb601a0b6ecb5b4b75285f772586e05ae388a
Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-12-20 09:01:40 -08:00
Dario Freni
22cdf96697 Create staging directory for Staging Manager.
Staging Manager is a high-level service (yet to be committed) that
manages multi-package sessions requiring a reboot to be applied, for
example if one of the packages is an APEX file. This directory will
contain the session data and the temporary copies of the packages.

Bug: 118865310
Test: N/A
Change-Id: I8aceefab849cf5af17086cb6868b801d1c2615e9
2018-12-20 15:24:18 +00:00
Martin Stjernholm
46e34601b8 Merge "Revert^2 "Use libdexfile external API in libunwindstack.""
am: 8478e56580

Change-Id: Ic48a003b5e258243459b1f3092dca4396f5b2a42
2018-12-20 03:47:01 -08:00
Martin Stjernholm
8478e56580 Merge "Revert^2 "Use libdexfile external API in libunwindstack."" 2018-12-20 11:34:26 +00:00
Elliott Hughes
1ae3087486 Merge "Build libbase with _FILE_OFFSET_BITS=64."
am: ef4c29886c

Change-Id: I7242a143caf5e590b8458cf26d7752f779045312
2018-12-19 17:02:18 -08:00
Elliott Hughes
ef4c29886c Merge "Build libbase with _FILE_OFFSET_BITS=64." 2018-12-20 00:47:38 +00:00
Yifan Hong
6a26bf3890 Merge changes from topic "vintf_object_recovery_mount"
am: 3fff9fbe00

Change-Id: I5a638893657ec0c2177f7bfc99e486803875f23a
2018-12-19 14:27:00 -08:00
Yifan Hong
3fff9fbe00 Merge changes from topic "vintf_object_recovery_mount"
* changes:
  Move parts of roots.cpp from librecovery
  fs_mgr_do_mount_one: allow overriding mount_point
2018-12-19 22:19:52 +00:00
Tom Cherry
84d0fc3e4b Merge "fs_mgr: Fix kernel command line parsing"
am: 38ff80810a

Change-Id: Ifbbbbc6483792af7032fb59af068dc277a228d37
2018-12-19 14:11:08 -08:00
Tom Cherry
38ff80810a Merge "fs_mgr: Fix kernel command line parsing" 2018-12-19 21:28:35 +00:00
Martin Stjernholm
bb4f2b440a Revert^2 "Use libdexfile external API in libunwindstack."
This reverts commit cacf5bf6bc.

Reason for revert: Re-apply with proper fix for VNDK visibility on marlin and sailfish.

Test: Manual repro of http://b/121110092#comment1 on reported branch
Test: atest CtsRenderscriptTestCases
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests
Test: Make image, flash, and reboot device.
Test: Forrest cts/art/gce-all: https://android-build.googleplex.com/builds/forrest/run/L00300000240828791
Test: Forrest cts/bionic/gce-all: https://android-build.googleplex.com/builds/forrest/run/L05600000240682947 (shows 27/2958 failed, but it doesn't pass on Blackbox either: http://screen/xbjioEf6UgR)
Test: Forrest cts/renderscript/gce-all: https://android-build.googleplex.com/builds/forrest/run/L66200000240680523
Bug: 119632407
Change-Id: I601aa97eac8127e30d753405f8bc1fc4ae7f849f
2018-12-19 21:04:35 +00:00
Elliott Hughes
9082e7af37 Build libbase with _FILE_OFFSET_BITS=64.
sehr points out that we already have two bugs caused by not doing this:
file.cpp has a call to pread with an off64_t that gets truncated, and
mapped_file.cpp does similar with mmap.

Bug: N/A
Test: ran tests
Change-Id: Ia098a836457e5adf109541235ad71c0ad7219da8
2018-12-19 12:55:17 -08:00
Yifan Hong
bf80e7dd91 Move parts of roots.cpp from librecovery
Move some mounting functionalities from librecovery so that
other modules can also mount logical partitions correctly.

- Also, refactor to use C++ Fstab struct.
- Also, fixed CreateLogicalPartitions() to take full path of
super device.

Test: run recovery tests
Test: vintf_object_recovery_test

Bug: 118634720
Bug: 113182233
Bug: 62292478
Change-Id: Ie02c3a941ed801fdae5818099faf5f3863444296
2018-12-19 10:23:50 -08:00
Yifan Hong
0cd2d5f048 fs_mgr_do_mount_one: allow overriding mount_point
Test: boots
Bug: 118634720
Change-Id: Ie2d05fdead27bfb1c922749272ff648bc7c418d1
2018-12-19 10:23:50 -08:00
Ruslan Trofymenko
23249c9fc5 fs_mgr: Fix kernel command line parsing
Remove new line character ('\n') from the kernel command line after
reading from '/proc/cmdline'. This character is not contained in the
original string and is added as a result of reading (according to
kernel source codes [1]):

    ...
    seq_puts(m, saved_command_line);
    seq_putc(m, '\n');
    ...

As a result, this may corrupt the last argument of the string. For
example, if the last argument is 'androidboot.slot_suffix=_a', then the
target partition ('vendor_a\n') will not be found in fstab section of
the device tree.

[1] fs/proc/cmdline.c

Change-Id: I96a853f1f55f27d782afe2ca8c0b006a75368149
Signed-off-by: Ruslan Trofymenko <ruslan.trofymenko@linaro.org>
2018-12-19 20:03:10 +02:00
Christopher Ferris
b211c87717 Merge "Fix offsets when shared lib split across maps."
am: 1baa19b1a6

Change-Id: I05884b4b1dbd604c4c2bdec961bf51c376ef6ba1
2018-12-19 09:24:53 -08:00
Treehugger Robot
1baa19b1a6 Merge "Fix offsets when shared lib split across maps." 2018-12-19 17:11:53 +00:00
Pete Bentley
87cb715dfa Merge "Propagate dlopen errors to callers of OpenNativeLibrary."
am: 613674049f

Change-Id: I9980386df961050e9a94813c8f709063db0f769d
2018-12-19 07:49:11 -08:00
Treehugger Robot
613674049f Merge "Propagate dlopen errors to callers of OpenNativeLibrary." 2018-12-19 15:36:25 +00:00
Lorenzo Colitti
e93f1bba90 Merge "Allow dlopen()ing libraries from the netd APEX."
am: 95a8d0d0c7

Change-Id: I3de825e011cd7f141d7333cc41f340b4e2528038
2018-12-19 06:30:51 -08:00
Jintao Zhu
245fb369b1 improve LogBufferElement copy constructor
LogBufferElement copy constructor supported only partial function.

Solution: handle all cases.

Test: unit test for calling the copy constructor with all possible states.
Change-Id: I55091569d98eb35a09b4c3fc068836ecd256558c
2018-12-19 22:20:12 +08:00
Lorenzo Colitti
95a8d0d0c7 Merge "Allow dlopen()ing libraries from the netd APEX." 2018-12-19 14:19:41 +00:00
Pete Bentley
632f142c42 Propagate dlopen errors to callers of OpenNativeLibrary.
Bug: 119867084
Test: make && flashall
Change-Id: If98082db39796f0097ce7ef1d095c9f202c3a95e
2018-12-19 13:48:01 +00:00
Lorenzo Colitti
472c900f6b Allow dlopen()ing libraries from the netd APEX.
This is a workaround to allow us to use libnetd_resolv.so from
the resolver APEX before b/120661824 is fixed.

We cannot put the APEX into the search path due to b/120661824,
but we can put it into the permitted path,

Test: builds, boots
Test: system/netd/tests/runtests.sh
Test: atest FrameworksNetTests android.net.cts.ConnectivityManagerTest
Change-Id: Ia68df860b7edc92180284f62736146e6029d7655
2018-12-19 16:52:06 +09:00
Martin Stjernholm
10acdb4a41 Merge "Revert "Use libdexfile external API in libunwindstack.""
am: 5ffa70ec4f

Change-Id: Ia65a115eebef84c6ed1ce28f43e326e5c8294ec4
2018-12-18 18:38:47 -08:00
Treehugger Robot
5ffa70ec4f Merge "Revert "Use libdexfile external API in libunwindstack."" 2018-12-19 02:30:27 +00:00
Remi NGUYEN VAN
e666f08f5b Merge "Add UID for network stack app"
am: 354d5f27ff

Change-Id: I13b575f3c283cd561c9567b2465c8c74931b69f3
2018-12-18 18:18:29 -08:00
Remi NGUYEN VAN
354d5f27ff Merge "Add UID for network stack app" 2018-12-19 02:01:23 +00:00
Martin Stjernholm
cacf5bf6bc Revert "Use libdexfile external API in libunwindstack."
This reverts commit 444e23d2fc.

The rest of the topic doesn't need to be reverted.

Reason for revert: Breaks renderscript on marlin and sailfish.

Test: Manual repro of http://b/121110092#comment1 on reported branch
Test: "atest CtsRenderscriptTestCases" on that branch
Test: mmma system/core/{libunwindstack,libbacktrace}, run host gtests
Test: Make image, flash, and reboot device.
Bug: 121110092, 119632407
Change-Id: If1976b19ce386c95bc5bd4fd6d523745c167de18
2018-12-19 00:11:04 +00:00
Yao Chen
d091c7a644 Merge "Log the last error code of StatsLog failures"
am: 796e61c279

Change-Id: I2ba67db87d906bbea4d0e07b090058d319be1584
2018-12-18 15:47:18 -08:00