Jiyong Park
877aba97c3
Merge "Replace bionic-unit-tests with CtsBionicTestCases" am: 00c767d177 am: 08557e6fa9
...
am: 9669d8f312
2019-02-15 19:28:30 -08:00
Jiyong Park
9669d8f312
Merge "Replace bionic-unit-tests with CtsBionicTestCases" am: 00c767d177
...
am: 08557e6fa9
2019-02-15 19:24:01 -08:00
Jiyong Park
08557e6fa9
Merge "Replace bionic-unit-tests with CtsBionicTestCases"
...
am: 00c767d177
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
586a681dbf
Merge "base: add ScopedLockAssertion." am: 3777d9cc10 am: 379b6f403f
...
am: f01d33b9e8
2019-02-15 18:47:40 -08:00
Josh Gao
f01d33b9e8
Merge "base: add ScopedLockAssertion." am: 3777d9cc10
...
am: 379b6f403f
2019-02-15 18:42:28 -08:00
Josh Gao
379b6f403f
Merge "base: add ScopedLockAssertion."
...
am: 3777d9cc10
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
2f07b9b189
Merge "adf: rename." am: fd877db2bc am: c0aa2c18c5
...
am: cecafa5329
2019-02-15 17:02:17 -08:00
Elliott Hughes
5485aac21a
Merge "liblog: make liblog_headers truly stand-alone." am: c911d5af6f am: 5b4453f27f
...
am: b9c6e6f9de
2019-02-15 16:56:24 -08:00
Elliott Hughes
cecafa5329
Merge "adf: rename." am: fd877db2bc
...
am: c0aa2c18c5
2019-02-15 16:45:05 -08:00
Elliott Hughes
b9c6e6f9de
Merge "liblog: make liblog_headers truly stand-alone." am: c911d5af6f
...
am: 5b4453f27f
2019-02-15 16:41:35 -08:00
Elliott Hughes
c0aa2c18c5
Merge "adf: rename."
...
am: fd877db2bc
2019-02-15 16:31:33 -08:00
Elliott Hughes
5b4453f27f
Merge "liblog: make liblog_headers truly stand-alone."
...
am: c911d5af6f
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
361b5f90a1
Merge "procinfo: Read inode number from /proc/<pid>/maps" am: 81767b1d3d am: a1752206da
...
am: 7caae2adf4
2019-02-15 15:26:23 -08:00
Sandeep Patil
7caae2adf4
Merge "procinfo: Read inode number from /proc/<pid>/maps" am: 81767b1d3d
...
am: a1752206da
2019-02-15 15:18:25 -08:00
Mark Salyzyn
32f4cfb1ac
Merge "fs_mgr: harden adb-remount-test.sh" am: e7d638a02b am: 7234c9af19
...
am: 1ec9c60db6
2019-02-15 15:09:18 -08:00
Sandeep Patil
a1752206da
Merge "procinfo: Read inode number from /proc/<pid>/maps"
...
am: 81767b1d3d
2019-02-15 15:09:09 -08:00
Mark Salyzyn
1ec9c60db6
Merge "fs_mgr: harden adb-remount-test.sh" am: e7d638a02b
...
am: 7234c9af19
2019-02-15 15:05:05 -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
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
756dd814e3
Merge "Ziparchive: Give tests a test config" am: cd67fa9c1a am: 3a5dc38aea
...
am: dd75c09657
2019-02-15 12:38:45 -08:00
Andreas Gampe
dd75c09657
Merge "Ziparchive: Give tests a test config" am: cd67fa9c1a
...
am: 3a5dc38aea
2019-02-15 12:30:36 -08:00
Pirama Arumuga Nainar
ffea3b5770
Merge "Mark gglMulx and gglMulAddx as always_inline" am: e479b47e0e am: cc464855e6
...
am: 40ffbba145
2019-02-15 12:26:46 -08:00
Pirama Arumuga Nainar
40ffbba145
Merge "Mark gglMulx and gglMulAddx as always_inline" am: e479b47e0e
...
am: cc464855e6
2019-02-15 12:22:41 -08:00
Andreas Gampe
3a5dc38aea
Merge "Ziparchive: Give tests a test config"
...
am: cd67fa9c1a
2019-02-15 12:22:25 -08:00
Pirama Arumuga Nainar
cc464855e6
Merge "Mark gglMulx and gglMulAddx as always_inline"
...
am: e479b47e0e
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
Maciej Żenczykowski
0693a67675
Merge "Refactor OWNERS files for Android Core Networking" am: af0c58f12d am: 75d1977b8b
...
am: a66897673c
2019-02-14 22:08:39 -08:00
Xin Li
9db0bcd827
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master am: 1c06c1e2de -s ours
...
am: cecb83d0f9
2019-02-14 21:51:04 -08:00
Xin Li
d42c72070f
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master am: caa079eb65 -s ours
...
am: 2eafbb0d48
2019-02-14 21:13:08 -08:00
Maciej Żenczykowski
a66897673c
Merge "Refactor OWNERS files for Android Core Networking" am: af0c58f12d
...
am: 75d1977b8b
2019-02-14 18:05:56 -08:00
Xin Li
cecb83d0f9
[automerger skipped] Merge "DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master
...
am: 1c06c1e2de
2019-02-14 17:01:59 -08: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
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
2eafbb0d48
[automerger skipped] DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: caa079eb65
2019-02-14 14:46:51 -08: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
36e82852f1
Merge "Enable metadata encryption for userdata_gsi." am: cb13a7766e am: b729fe143a
...
am: b2f0953844
2019-02-14 12:51:45 -08:00
David Anderson
b2f0953844
Merge "Enable metadata encryption for userdata_gsi." am: cb13a7766e
...
am: b729fe143a
2019-02-14 12:47:50 -08:00
David Anderson
b729fe143a
Merge "Enable metadata encryption for userdata_gsi."
...
am: cb13a7766e
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
