Gavin Corkery
dce38e8a71
Merge "Rename data/staging to data/pkg_staging."
2019-02-19 14:40:59 +00:00
vichang
e357682485
Merge changes from topic "dup_icu4c" am: ce912aadda am: 055708f26b
...
am: 1ab3de395d
Change-Id: I04801cb9d98d0b6072f32a89ab0891a729a25f5d
2019-02-19 02:55:23 -08:00
Victor Chang
394812d8ef
Remove the public libs in runtime namespace am: f70a2fe4c1 am: 2c75b73688
...
am: b4f1e56942
Change-Id: I27495388d8a5b7604046d811019b25fdafed0e18
2019-02-19 02:54:23 -08:00
vichang
1ab3de395d
Merge changes from topic "dup_icu4c" am: ce912aadda
...
am: 055708f26b
Change-Id: I6bfd325bae7e80b81bca66298079339af988a19e
2019-02-19 02:42:49 -08:00
Victor Chang
b4f1e56942
Remove the public libs in runtime namespace am: f70a2fe4c1
...
am: 2c75b73688
Change-Id: Ide803ddfa7bea7c59ce9713bfaf12a11fb1a729c
2019-02-19 02:37:35 -08:00
vichang
055708f26b
Merge changes from topic "dup_icu4c"
...
am: ce912aadda
Change-Id: Ied6cc731e1c57ab48340b5698c669933ed1ac7d7
2019-02-19 02:28:23 -08:00
Victor Chang
2c75b73688
Remove the public libs in runtime namespace
...
am: f70a2fe4c1
Change-Id: I7bf3413685b13a10e146319fbdbd176d31afd00d
2019-02-19 02:27:25 -08:00
vichang
ce912aadda
Merge changes from topic "dup_icu4c"
...
* changes:
Linker namespace changes for moving ICU4C to APEX
Remove the public libs in runtime namespace
2019-02-19 10:14:31 +00:00
Gavin Corkery
ac1eeb7f78
Rename data/staging to data/pkg_staging.
...
Test: Build and flash, atest apex_e2e_tests
Fixes: 122999313
Change-Id: I878ee41f804956ee7533d64e844ce98e5a8afacc
2019-02-17 20:58:26 +00:00
Josh Gao
fb45030cad
Merge "adbd: fallback to legacy USB implementation if needed." am: f80c326d2e am: dc50e92b71
...
am: 8b47738b0a
Change-Id: I3d8e50a4168232ae0367e7bcaf5ac670daa24e69
2019-02-16 20:30:03 -08:00
Josh Gao
8b47738b0a
Merge "adbd: fallback to legacy USB implementation if needed." am: f80c326d2e
...
am: dc50e92b71
Change-Id: I13f84f80a1f5b9da962e40dcdf33f9d7a95a9c0f
2019-02-16 20:25:53 -08:00
Josh Gao
dc50e92b71
Merge "adbd: fallback to legacy USB implementation if needed."
...
am: f80c326d2e
Change-Id: Idf3b8abff8090ef3d4a547db2caec9aa17f8e503
2019-02-16 20:22:43 -08:00
Josh Gao
f80c326d2e
Merge "adbd: fallback to legacy USB implementation if needed."
2019-02-17 04:14:22 +00:00
Tom Cherry
06e0bd4e9a
Merge "Export init.environ.rc in early-init instead of init" am: acfb705603 am: 8f442d5efa
...
am: 3b236e9a6f
Change-Id: Ife12bf3e2b664c6f8388d2cd2313eb7d5438b9f4
2019-02-16 12:20:50 -08:00
Tom Cherry
3b236e9a6f
Merge "Export init.environ.rc in early-init instead of init" am: acfb705603
...
am: 8f442d5efa
Change-Id: I39ac552182522b63db5eaa83b99b4fcce5218315
2019-02-16 12:14:29 -08:00
Tom Cherry
8f442d5efa
Merge "Export init.environ.rc in early-init instead of init"
...
am: acfb705603
Change-Id: I30a95c806c6694ab3f17996001e0c9668cf2d8e5
2019-02-16 12:09:19 -08:00
Tom Cherry
acfb705603
Merge "Export init.environ.rc in early-init instead of init"
2019-02-16 17:53:53 +00:00
Paul Trautrim
ec1b9749a9
Merge "Add presubmit test for vendor overlay" am: 024e442812 am: ba69d077f1
...
am: 7790ce5f7e
Change-Id: I5f87acb41d71ca0555b6e0cd82aa039c73ae92bd
2019-02-16 09:10:38 -08:00
Paul Trautrim
7790ce5f7e
Merge "Add presubmit test for vendor overlay" am: 024e442812
...
am: ba69d077f1
Change-Id: I3c84d26e2dfe2aa69a2dcc60fd4ca6bfb1437904
2019-02-16 09:06:29 -08:00
Paul Trautrim
ba69d077f1
Merge "Add presubmit test for vendor overlay"
...
am: 024e442812
Change-Id: If101e643188d2d51ca12e2995bfbfde9a369132f
2019-02-16 09:02:19 -08:00
Paul Trautrim
024e442812
Merge "Add presubmit test for vendor overlay"
2019-02-16 16:53:37 +00:00
Jiyong Park
877aba97c3
Merge "Replace bionic-unit-tests with CtsBionicTestCases" am: 00c767d177 am: 08557e6fa9
...
am: 9669d8f312
Change-Id: Ieea4949f7931e97520b84c156c7c40502c963eb6
2019-02-15 19:28:30 -08:00
Jiyong Park
9669d8f312
Merge "Replace bionic-unit-tests with CtsBionicTestCases" am: 00c767d177
...
am: 08557e6fa9
Change-Id: I64129f7ce30e9f10311110b88d5932179f58b3f1
2019-02-15 19:24:01 -08:00
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
586a681dbf
Merge "base: add ScopedLockAssertion." am: 3777d9cc10 am: 379b6f403f
...
am: f01d33b9e8
Change-Id: If81cf0d25621d6f733b39823d6b6dbc774a37150
2019-02-15 18:47:40 -08:00
Josh Gao
f01d33b9e8
Merge "base: add ScopedLockAssertion." am: 3777d9cc10
...
am: 379b6f403f
Change-Id: I47d1ab2dc1d904e7f22c541232b15ee1ec97aa17
2019-02-15 18:42:28 -08: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
2f07b9b189
Merge "adf: rename." am: fd877db2bc am: c0aa2c18c5
...
am: cecafa5329
Change-Id: I87b3ff9cc272f4e6410c07bf70ed68db4f4f3624
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
Change-Id: I73c267e892aa4d8548945649858911b6176447de
2019-02-15 16:56:24 -08:00
Elliott Hughes
cecafa5329
Merge "adf: rename." am: fd877db2bc
...
am: c0aa2c18c5
Change-Id: I10daca643f55cba38a2cef3192d3461476f43fa7
2019-02-15 16:45:05 -08:00
Elliott Hughes
b9c6e6f9de
Merge "liblog: make liblog_headers truly stand-alone." am: c911d5af6f
...
am: 5b4453f27f
Change-Id: I4f1e032781c15fccf2aa675e39e46e10b928de4f
2019-02-15 16:41:35 -08: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
Tom Cherry
d540e527e1
Export init.environ.rc in early-init instead of init
...
Now that we always have system mounted early, we're starting to load
various daemons during the `init` trigger and these daemons need the
environment set up from init.environ.rc, so we move it to early-init.
This shouldn't need to go any further earlier in the future, since
nothing besides ueventd should ever start in early-init.
Test: systems boot, early daemons get right environment
Change-Id: I02f425a1500377c5de3427afa7872073e77a066f
2019-02-15 15:55:18 -08:00
Sandeep Patil
361b5f90a1
Merge "procinfo: Read inode number from /proc/<pid>/maps" am: 81767b1d3d am: a1752206da
...
am: 7caae2adf4
Change-Id: Ib33a789920ea54eb13eafbb37cd973af5125fcdb
2019-02-15 15:26:23 -08:00
Paul Trautrim
c10d3fdb2c
Add presubmit test for vendor overlay
...
Add a test that creates files in the appropriate vendor_overlay directory and
verifies that they are correctly overlaid (or not) onto /vendor after rebooting.
Test: locally running atest
Change-Id: I65860dbeb837f86ac030fa51b3af93844e82de96
2019-02-16 08:24:35 +09:00
Sandeep Patil
7caae2adf4
Merge "procinfo: Read inode number from /proc/<pid>/maps" am: 81767b1d3d
...
am: a1752206da
Change-Id: Idec54fc44a77c6bdd6692c87b13af62f90bb3cfd
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
Change-Id: Ib3f12d4640e1ec3c6d3894d6fa70131af761a37f
2019-02-15 15:09:18 -08: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
Mark Salyzyn
1ec9c60db6
Merge "fs_mgr: harden adb-remount-test.sh" am: e7d638a02b
...
am: 7234c9af19
Change-Id: I9b68c4862409c125b7f811dc1b4ba053d6603fe6
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
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
756dd814e3
Merge "Ziparchive: Give tests a test config" am: cd67fa9c1a am: 3a5dc38aea
...
am: dd75c09657
Change-Id: Id0d1c39cfcebabdc2735c2dbb57b34656f48fc5e
2019-02-15 12:38:45 -08:00
Andreas Gampe
dd75c09657
Merge "Ziparchive: Give tests a test config" am: cd67fa9c1a
...
am: 3a5dc38aea
Change-Id: I1f1bf7b0a510ded10fe5696db8c5896a91b9ffdf
2019-02-15 12:30:36 -08:00