Commit graph

45595 commits

Author SHA1 Message Date
Jiyong Park
f472ffff49 Merge "Add TEST_MAPPING for system/core/rootdir/etc"
am: ebadad5c56

Change-Id: I1ffd33039ffd4048f4b82cd30354096217377602
2019-02-13 16:33:48 -08:00
Treehugger Robot
ebadad5c56 Merge "Add TEST_MAPPING for system/core/rootdir/etc" 2019-02-14 00:11:36 +00:00
Martin Stjernholm
542a73be66 Merge "Add compat symlinks into the Runtime APEX for the ART binaries."
am: 48c6d139b3

Change-Id: I96b382d1005dc3ccad016f194329cb83231144e9
2019-02-13 15:14:50 -08:00
Treehugger Robot
48c6d139b3 Merge "Add compat symlinks into the Runtime APEX for the ART binaries." 2019-02-13 23:08:01 +00:00
Erick Reyes
a84a94c977 Merge "libmeminfo: change dmabuf_dump from soc_specific to product_specific"
am: ac4c2d8947

Change-Id: Ibc52e0830da31d29dea41d18f63aa0d6a327131d
2019-02-13 15:06:49 -08:00
Treehugger Robot
ac4c2d8947 Merge "libmeminfo: change dmabuf_dump from soc_specific to product_specific" 2019-02-13 22:39:49 +00:00
Tom Cherry
65abab346e Merge "liblog: simplify socket_local_client() and always use CLOEXEC"
am: 111e38e5bc

Change-Id: If1187a7b5dc686f07226b9e2dd39829cb91f7e18
2019-02-13 08:46:26 -08:00
Tom Cherry
111e38e5bc Merge "liblog: simplify socket_local_client() and always use CLOEXEC" 2019-02-13 16:34:55 +00:00
Martin Stjernholm
7f77dbfe64 Add compat symlinks into the Runtime APEX for the ART binaries.
This is a precaution in case there are dependencies on the binaries in the
old location. b/124106384 tracks eliminating them (if any).

Test: Flash and check symlinks are there with adb shell ls -l system/bin
Test: adb shell system/bin/<binary>
Bug: 113373927
Bug: 124106384
Change-Id: Ib4102fe55117611f68184102e68a10ea47de0065
2019-02-13 15:10:11 +00:00
Martin Stjernholm
1ab2ba789f Merge "Introduce a separate linker config section for native tests."
am: 18de135031

Change-Id: I875b6ec6c21f0879786b5d619447908a2248771c
2019-02-13 02:42:42 -08:00
Martin Stjernholm
18de135031 Merge "Introduce a separate linker config section for native tests." 2019-02-13 10:32:29 +00:00
Jiyong Park
8011f03eb2 Add TEST_MAPPING for system/core/rootdir/etc
bionic-unit-tests runs when one of the linker config files is changed.

Test: N/A
Change-Id: I8af1a9728dab4492fe34a3b4daab9c5f9973d84f
2019-02-13 16:40:47 +09:00
Pirama Arumuga Nainar
4834824a37 Merge "Make inlines static"
am: 68c5ce22fb

Change-Id: I08c066b7c49015b07aa46cff884a97d9dd2f675d
2019-02-12 22:42:21 -08:00
Pirama Arumuga Nainar
68c5ce22fb Merge "Make inlines static" 2019-02-13 06:30:11 +00:00
Bowgo Tsai
0e9c7e3d0c Merge "libfs_avb: adding two public APIs"
am: c7b5c4fa6b

Change-Id: I7bafcef07ff2550240374f8894fa048815013b27
2019-02-12 19:32:26 -08:00
Logan Chien
321b1a6345 Merge "Fix APEX run-time ld.config.txt for ASAN targets"
am: 8540f50887

Change-Id: Ib5be28663773cbee7cd87bbe44f071c3c6c80bf3
2019-02-12 19:31:29 -08:00
Jiyong Park
074f836c74 Merge "shim libraries for libnativeloader and libnativebridge"
am: 4b6b7b6715

Change-Id: I43204ec63b34e7a2f52472946300176ea495e2c7
2019-02-12 19:15:52 -08:00
Justin Yun
c8631a3e1f Merge "Change search order for vendor processes in vndk_lite."
am: 47e8300412

Change-Id: Idae3845ee8cfa1f2c9bb00ab85c273af0f7a67b3
2019-02-12 19:15:07 -08:00
Treehugger Robot
c7b5c4fa6b Merge "libfs_avb: adding two public APIs" 2019-02-13 03:07:37 +00:00
Logan Chien
8540f50887 Merge "Fix APEX run-time ld.config.txt for ASAN targets" 2019-02-13 02:24:08 +00:00
Treehugger Robot
4b6b7b6715 Merge "shim libraries for libnativeloader and libnativebridge" 2019-02-13 02:17:35 +00:00
Treehugger Robot
47e8300412 Merge "Change search order for vendor processes in vndk_lite." 2019-02-13 01:57:08 +00:00
Justin Yun
023ff46e18 Change search order for vendor processes in vndk_lite.
Originally, vndk_lite does not include system/lib/vndk-* directory but
searching the required files in system/lib instead. However, in GSI,
they are using the vndk libs which has symbols than core variants.
To avoid this problem, allow the vendor processes in vndk_lite devices
to search system/lib prior to vndk libs.

Bug: 124063441
Test: Check boot for vndk_lite devices.
Change-Id: I89a72e9d43d6fb05f4b6d87bbd4500f8febfe970
2019-02-13 01:56:28 +00:00
Dongwon Kang
1fd25add88 Merge "Exclude libvndksupport from APEXes."
am: 0b4f2532a7

Change-Id: I61e449d41c1829d1e0ed996eadeee6096461480d
2019-02-12 17:02:30 -08:00
Dongwon Kang
0b4f2532a7 Merge "Exclude libvndksupport from APEXes." 2019-02-13 00:40:53 +00:00
Tom Cherry
05de1ba38e liblog: simplify socket_local_client() and always use CLOEXEC
socket_local_client() was copied from libcutils, but we only need a
small subset of its functionality.  We instead create our own version
with just the needed parts.

Importantly, use CLOEXEC in this new function and other places where
it was missing previously.

Test: logging works, liblog-unit-tests
Change-Id: Ifb929227af67bafa13e391eab92358d9f6fe6450
2019-02-12 12:53:19 -08:00
Martin Stjernholm
bcb5ba75a5 Introduce a separate linker config section for native tests.
There are tests that require access to both system and vendor libraries,
like what the linker sets up when there is no matching config section.

Test: atest cameraservice_test libsurfaceflinger_unittest perfprofd_test \
  inputflinger_tests (no new failures, but 3 old ones)
Test: Internal test can load libandroid.so
Bug: 124127405
Bug: 123700170

Change-Id: I4f5cb2e09bdf1ae510259198c08c252b41249d94
2019-02-12 18:45:37 +00:00
Tom Cherry
99331422e0 Merge "Refactor fs_mgr_update_verity_state()"
am: 5272f9b017

Change-Id: I23151b9a2c7bf28e4f62dfdbf5049d0100241cf1
2019-02-12 09:30:02 -08:00
Tom Cherry
5272f9b017 Merge "Refactor fs_mgr_update_verity_state()" 2019-02-12 17:22:09 +00:00
Steven Laver
919a931f1e Merge "Allow properties to be derived from partition-specific properties during init"
am: 944e6f1d17

Change-Id: I20fc0657ecb8d2dc383e1349bb01580d806138b7
2019-02-12 08:52:35 -08:00
Steven Laver
944e6f1d17 Merge "Allow properties to be derived from partition-specific properties during init" 2019-02-12 16:44:57 +00:00
Junyu Lai
151677dc51 Merge "Refactor OWNERS files for Android Core Networking"
am: 1d7966bd46

Change-Id: I6b29d05038e53895b8cd60fa08af2eaf388ec342
2019-02-12 08:35:00 -08:00
Junyu Lai
1d7966bd46 Merge "Refactor OWNERS files for Android Core Networking" 2019-02-12 16:20:27 +00:00
Bowgo Tsai
cd316ea4a0 libfs_avb: adding two public APIs
The client can include <fs_avb/fs_avb_util.h> to use the two new
functions to load vbmeta for a FstabEntry and extract the hash tree
descriptor from the loaded vbmeta, respectively.

// Given a FstabEntry, loads and verifies the vbmeta.
std::unique_ptr<VBMetaData> LoadAndVerifyVbmeta(...);

// Gets the hashtree descriptor with avb_partition_name from the vbmeta.
std::unique_ptr<FsAvbHashtreeDescriptor> GetHashtreeDescriptor(...);

Bug: 65470881
Test: atest libfs_avb_test
Test: atest libfs_avb_internal_test
Test: atest libfs_avb_device_test
Change-Id: I7d6619eb8140c14734ffb8f8a1b22cddd2f562f0
2019-02-12 22:03:20 +08:00
Logan Chien
f7b46a2eb1 Fix APEX run-time ld.config.txt for ASAN targets
This commit fixes the search paths for vendor binaries in ASAN targets.

Test: Boot aosp_walleye-userdebug to home screen
Change-Id: Id87ceee3c43098bd453f6fae4f32ea62355f922b
2019-02-12 20:02:05 +08:00
Jiyong Park
00f2ebe9cc shim libraries for libnativeloader and libnativebridge
libnativeloader_lazy and libnativebridge_lazy are shim libraries for
libnativeloader and libnativebridge, respectively.

The shim libraries provides the same APIs as their counterparts, but
when the APIs are called, the APIs from the real libraries are
loaded/linked/and executed using dlopen/dlsym.

Bug: 123403798
Bug: 124250621
Test: m
Test: device boots to the UI
Test: mma under system/core/libnativebridge with aosp_cf_x86
adb sync; execute all tests under
/data/nativetest/libnativebridge-lazy-tests
All passes except NativeBridgeTest.V2_Signal which is also failing
in /data/nativetest/libnativebridge-tests.

Change-Id: Ic6484784eaa7872dcdd2decbb30943fb34c1abd7
2019-02-12 19:35:45 +09:00
junyulai
1e9c3a50fb Refactor OWNERS files for Android Core Networking
Bug: 120829091
Test: build/make/tools/checkowners.py -c -v path/OWNERS
Change-Id: Ia172b5e907a28441d288b84cd74ceea24c58cbcf
2019-02-12 13:25:13 +08:00
Erick Reyes
9bb8e0d704 libmeminfo: change dmabuf_dump from soc_specific to product_specific
The vendor partition does not give dmabuf_dump enough permissions to
retrieve shared buffer information for all processes. Move it to product
partition where it can be invoked from platform's dumpstate.

Bug: 63860998

Change-Id: I73957f59943d1e49fcb59abb723aad4eeeaa4172
Signed-off-by: Erick Reyes <erickreyes@google.com>
2019-02-11 19:16:58 -08:00
Jiyong Park
bc08d9d207 Merge "apexd is started much earlier to create loopback devices"
am: 34f3660e2c

Change-Id: I3132ba5196465e69a0bc38923487c9bf0ec6b3fb
2019-02-11 18:08:02 -08:00
Elliott Hughes
f984d7a403 Merge "Clean up libcutils/libutils tests."
am: 57150963a3

Change-Id: Ie4113224b9ac63caeed6ed8fa3ea9eb7125fa2a6
2019-02-11 18:07:05 -08:00
Treehugger Robot
34f3660e2c Merge "apexd is started much earlier to create loopback devices" 2019-02-12 01:55:03 +00:00
Treehugger Robot
57150963a3 Merge "Clean up libcutils/libutils tests." 2019-02-12 01:53:53 +00:00
Mark Salyzyn
ef2d4afd18 Merge "bootstat: local GetProperty use libbase"
am: 0554bccb7a

Change-Id: I209b0418696bc242d75a2f2301310b2f60a4553a
2019-02-11 17:51:51 -08:00
Treehugger Robot
0554bccb7a Merge "bootstat: local GetProperty use libbase" 2019-02-12 01:42:51 +00:00
Tom Cherry
5d3c8c5bf9 Merge "Remove logic to fake /system in overlayfs"
am: d2ae1c91ed

Change-Id: I2878c258682defa379cf4a9bc68fad17e0f2c63f
2019-02-11 17:22:29 -08:00
Tom Cherry
d2ae1c91ed Merge "Remove logic to fake /system in overlayfs" 2019-02-12 01:04:21 +00:00
Mark Salyzyn
88d308d786 bootstat: local GetProperty use libbase
libbase GetProperty collects the properties properly, which also
allow for content greater than 128 bytes in length.

Replace internal GetProperty and SetProperty helpers with libbase
version.

Test: unit tests
Bug: 121161069
Bug: 124114707
Change-Id: Ic0829955705ebaa19d747bb3f6942f4b9786316a
2019-02-11 13:16:59 -08:00
Elliott Hughes
01705e4f1d Clean up libcutils/libutils tests.
Move tests in the same directory as the corresponding code, so it's
easier to see what is/isn't tested.

Fix naming of libcutils_tests (plural) to match the singular that's more
common (even though the plural makes more sense to me).

Add these two to system/core/'s TEST_MAPPING.

Remove obsolete AndroidTest.xml.

Fix a flaky (timing-dependent) libcutils test.

Test: ran tests
Change-Id: I7e0a31ff45c8a152562bf66fc97161594249366e
2019-02-11 13:15:56 -08:00
Tom Cherry
cf80b6d6e5 Refactor fs_mgr_update_verity_state()
fs_mgr_update_verity_state() has two callers with generally different
intentions.  One caller loops through all entries in the default fstab
to set partition.<mount_point>.verified properties.  The other caller
is only interested in whether or a specific mount point has verity
enabled.

Given this, we refactor fs_mgr_update_verity_state() to
fs_mgr_get_verity_mount_point() which takes a single FstabEntry and
returns the mount point used for the dm-verity device or an empty
option if verity is not enabled on that mount point.

Test: adb-remount-test.sh test on blueline
Change-Id: Ic7dd8390509e95b2931b21e544c919a544138864
2019-02-11 12:50:22 -08:00
Dongwon Kang
9dff515bdb Exclude libvndksupport from APEXes.
Test: build, boot, and checked mount paths.
Bug: 123948402
Change-Id: I687dde4f3d1a7971f68c7c536de5002dcdaecfa4
2019-02-11 11:14:11 -08:00