Commit graph

45663 commits

Author SHA1 Message Date
Jiyong Park
08557e6fa9 Merge "Replace bionic-unit-tests with CtsBionicTestCases"
am: 00c767d177

Change-Id: Ia1c53e7e1b627360456b4fe0ff2f0f9dc846c076
2019-02-15 19:20:04 -08:00
Treehugger Robot
00c767d177 Merge "Replace bionic-unit-tests with CtsBionicTestCases" 2019-02-16 03:12:22 +00:00
Josh Gao
379b6f403f Merge "base: add ScopedLockAssertion."
am: 3777d9cc10

Change-Id: I87de4148215f168aa2d4da566bbbc3fb40699f41
2019-02-15 18:38:17 -08:00
Treehugger Robot
3777d9cc10 Merge "base: add ScopedLockAssertion." 2019-02-16 02:34:32 +00:00
Elliott Hughes
c0aa2c18c5 Merge "adf: rename."
am: fd877db2bc

Change-Id: I1b30c965b92286f84c13c56d71770bb79ce981dd
2019-02-15 16:31:33 -08:00
Elliott Hughes
5b4453f27f Merge "liblog: make liblog_headers truly stand-alone."
am: c911d5af6f

Change-Id: I01ba40d48f13275c8c9eef6c9b1e8a0f3d429f5a
2019-02-15 16:26:33 -08:00
Elliott Hughes
fd877db2bc Merge "adf: rename." 2019-02-16 00:15:17 +00:00
Elliott Hughes
c911d5af6f Merge "liblog: make liblog_headers truly stand-alone." 2019-02-16 00:12:51 +00:00
Sandeep Patil
a1752206da Merge "procinfo: Read inode number from /proc/<pid>/maps"
am: 81767b1d3d

Change-Id: I7a87a5b6f6b8bcc01b4eb324ffd6a16d8013ade1
2019-02-15 15:09:09 -08:00
Treehugger Robot
81767b1d3d Merge "procinfo: Read inode number from /proc/<pid>/maps" 2019-02-15 23:03:00 +00:00
Mark Salyzyn
7234c9af19 Merge "fs_mgr: harden adb-remount-test.sh"
am: e7d638a02b

Change-Id: I8edc65b0e8e19e16e2edfd20053f3ef13f948d22
2019-02-15 15:01:56 -08:00
Mark Salyzyn
e7d638a02b Merge "fs_mgr: harden adb-remount-test.sh" 2019-02-15 22:51:01 +00:00
Mark Salyzyn
bbe33f7826 fs_mgr: harden adb-remount-test.sh
Harden adb-remount-test.sh script.  Add --no-color and --color
options.  Allows --serial to be passed in.  Add a recovery handler
that restores the device to verity enabled if possible.  List the
partitions sizes as they may be relevant to triaging errors.  Allow
for devices that have a mixed set of remounts, some direct, some
with overlayfs.  Allow two scripts to run at the same time on a host
machine targetting different devices.  Detect if wrong adb is used
for adb reboot-fastboot.

Add a build target for adb-remount-test.sh so that the script
is landed into the host tools bin for easy pickup.

Test: adb-remount-test.sh
Bug: 123079041
Change-Id: I6369a245a656419067ec4350a4dbdf78c9b0533e
2019-02-15 14:28:19 -08:00
Andreas Gampe
3a5dc38aea Merge "Ziparchive: Give tests a test config"
am: cd67fa9c1a

Change-Id: Ibe90cb4b11dca305d4136d1bb9317b6c505a2c15
2019-02-15 12:22:25 -08:00
Pirama Arumuga Nainar
cc464855e6 Merge "Mark gglMulx and gglMulAddx as always_inline"
am: e479b47e0e

Change-Id: I7c09ca2b03ee5a8d9a25b8e846747ce01a27fb3f
2019-02-15 12:18:25 -08:00
Andreas Gampe
cd67fa9c1a Merge "Ziparchive: Give tests a test config" 2019-02-15 20:15:37 +00:00
Pirama Arumuga Nainar
e479b47e0e Merge "Mark gglMulx and gglMulAddx as always_inline" 2019-02-15 20:03:25 +00:00
Andreas Gampe
881e2e198b Ziparchive: Give tests a test config
To work around problems with the autogenerated one.

Bug: 117891984
Bug: 124515549
Test: atest ziparchive-tests
Change-Id: Ia4b352b7404255a4fe9e644a56ae9c5d41c79886
2019-02-15 11:53:49 -08:00
Jiyong Park
d8b07f8c05 Replace bionic-unit-tests with CtsBionicTestCases
Bug: 124437796
Test: monitor treehugger
Change-Id: I8bf8d1bb1af3f4ccfca434846adcc1f4eda3fb69
2019-02-15 15:20:59 +09:00
Elliott Hughes
277439fd8a adf: rename.
Since this was deprecated in Linux 4.9, mark it as such (and not
coincidentally move it out of the way of auto-complete for adb).

Test: treehugger
Change-Id: I65542343ec49246bba7f44a815c3e478e9d5c5c3
2019-02-14 16:30:24 -08:00
Maciej Żenczykowski
75d1977b8b Merge "Refactor OWNERS files for Android Core Networking"
am: af0c58f12d

Change-Id: I39b5d2fa538fee67fcaa84ce86f5cd61e13aec37
2019-02-14 16:22:33 -08:00
Maciej Żenczykowski
af0c58f12d Merge "Refactor OWNERS files for Android Core Networking" 2019-02-15 00:14:43 +00:00
Xin Li
1c06c1e2de Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:39 +00:00
David Anderson
b729fe143a Merge "Enable metadata encryption for userdata_gsi."
am: cb13a7766e

Change-Id: I06276c91476e21c13b22a0c5f5676452de203deb
2019-02-14 12:41:35 -08:00
David Anderson
cb13a7766e Merge "Enable metadata encryption for userdata_gsi." 2019-02-14 20:27:05 +00:00
Pirama Arumuga Nainar
5d88cef82b Mark gglMulx and gglMulAddx as always_inline
Bug: http://b/116873221
Bug: http://b/124451159

This is to get them building with O0 (needed for coverage builds).  At
O0, without the always_inline, the compiler is not able to reconcile the
constraints in the inline assembly.

In file included from system/core/libpixelflinger/trap.cpp:27:
In file included from system/core/libpixelflinger/trap.h:22:
In file included from
system/core/libpixelflinger/include/private/pixelflinger/ggl_context.h:27:
system/core/libpixelflinger/include/private/pixelflinger/ggl_fixed.h:113:9:
error: invalid operand for inline asm constraint 'I'
  asm("smull  %[lo], %[hi], %[x], %[y]            \n"
      ^
system/core/libpixelflinger/include/private/pixelflinger/ggl_fixed.h:136:9:
error: invalid operand for inline asm constraint 'I'
  asm("smull  %[lo], %[hi], %[x], %[y]            \n"
      ^
2 errors generated.

Test: m NATIVE_COVERAGE=true COVERAGE_PATHS=system/core/libpixelflinger
Test: m
Change-Id: Ia4516b19b957687b5fa25d2d100679abcec29366
2019-02-14 11:59:48 -08:00
Mark Salyzyn
371af3e769 Merge "fs_mgr: overlayfs: export fs_mgr_overlayfs_candidate_list"
am: fa130f3ad4

Change-Id: Ic220635d0bb5b91b6bde1aaefd5194cce44f4fd9
2019-02-14 11:27:21 -08:00
Mark Salyzyn
fa130f3ad4 Merge "fs_mgr: overlayfs: export fs_mgr_overlayfs_candidate_list" 2019-02-14 19:20:45 +00:00
Suren Baghdasaryan
e95fd681f7 Merge "Fix cgroup support for recovery mode"
am: da20bc763e

Change-Id: I123397885ee61abe8c163eaaabe72fc8925baa60
2019-02-14 10:18:47 -08:00
Vic Yang
4d3eae0a05 Merge "libvndksupport: Add android_is_in_vendor_process()"
am: 4f5625d9c7

Change-Id: I7f4b70a270db8146f3d3814a3cbda814ee454999
2019-02-14 10:12:18 -08:00
Bowgo Tsai
5ac79a8a78 Merge "Skip enabling dm-verity for live GSI when needed"
am: 941cb7606c

Change-Id: Id59737a315540e80c628cfe3a42093e8e2646732
2019-02-14 10:11:31 -08:00
Suren Baghdasaryan
da20bc763e Merge "Fix cgroup support for recovery mode" 2019-02-14 18:08:40 +00:00
Vic Yang
4f5625d9c7 Merge "libvndksupport: Add android_is_in_vendor_process()" 2019-02-14 18:03:19 +00:00
Treehugger Robot
941cb7606c Merge "Skip enabling dm-verity for live GSI when needed" 2019-02-14 17:55:56 +00:00
Suren Baghdasaryan
d032a92c04 Fix cgroup support for recovery mode
In recovery mode a separate set of cgroups should be mounted. Add a
cgroups.recovery.json file to describe cgroups mounted during recovery.
Change cgroups descriptor parset to allow cgroups and cgroups2 sections
to be omitted.

Bug: 124270406
Test: "adb reboot sideload; adb devices" shows 'sideload' as expected

Change-Id: Ic32bd2b4612ec8390064f87d4655d1bd1183d741
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-14 17:08:40 +00:00
Martin Stjernholm
12a4cef6e8 Merge "Use new static target for libdexfile_support."
am: 612a6d6ba3

Change-Id: Iaca2a1c769598e1512f29b693b039b2446197f5b
2019-02-14 06:43:22 -08:00
Treehugger Robot
612a6d6ba3 Merge "Use new static target for libdexfile_support." 2019-02-14 14:36:32 +00:00
junyulai
54302442e2 Refactor OWNERS files for Android Core Networking
Bug: 120829091
Test: build/make/tools/checkowners.py -c -v path/OWNERS
Change-Id: I0b9dd6a6c01e46d887d1161179ca3791f461dce6
2019-02-14 14:13:53 +08:00
Suren Baghdasaryan
4976d62a06 Merge "Suppress error log when timerslack_ns write fails for already dead process"
am: f5b7361cf4

Change-Id: I148847402b7cbc925e64a5412f45950fdda85f2d
2019-02-13 21:50:42 -08:00
Suren Baghdasaryan
f5b7361cf4 Merge "Suppress error log when timerslack_ns write fails for already dead process" 2019-02-14 05:44:34 +00:00
Jooyung Han
354e176021 Merge "Mark libs as double_loadable"
am: 4ecbe76354

Change-Id: Ibd1c9a8bd0fbf70958801782f3cb9c30119b8454
2019-02-13 20:24:09 -08:00
Jiyong Park
169fafd1af Merge "Update OWNERS for libnativebridge"
am: 6332b7a368

Change-Id: I0a716955a3696f7d0f801f013146684b09545d64
2019-02-13 20:23:25 -08:00
Suren Baghdasaryan
2bc522878d Suppress error log when timerslack_ns write fails for already dead process
lmkd uses set_sched_priority to expedite killing of its victims and this
sometimes results in timerslack_ns writes for an process which is already
dead. These messages are detrimental during troubleshooting and do not
indicate a real problem, therefore need to be suppressed.

Bug: 124324891
Test: lmkd_unit_test

Change-Id: I5bc071b47d386c279dd9a56eee51dba7797f4520
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-14 03:51:17 +00:00
Treehugger Robot
4ecbe76354 Merge "Mark libs as double_loadable" 2019-02-14 02:10:05 +00:00
Treehugger Robot
6332b7a368 Merge "Update OWNERS for libnativebridge" 2019-02-14 01:42:28 +00:00
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