ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
26597 commits 1 branch 0 tags 217 MiB
Commit graph

26597 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Cherry
e35e4e4e39 fs_mgr: fix header ordering 
A merge conflict resolution un-alphabetized the order of these
headers; this commit puts them back in order.

Change-Id: I13c26fbb8f88fe2ce0b332721235b3e4eba7deaf
 2016-11-30 17:22:55 -08:00
Elliott Hughes
5dd53bf466 Merge "Use hasmntopt(3) rather than reinventing the wheel." am: 769a5a1962 
am: 8656ed109b

Change-Id: Ied4c404b0d0f957bfe0e9ff3841173b52147b21b
 2016-11-30 22:56:00 +00:00
Elliott Hughes
8656ed109b Merge "Use hasmntopt(3) rather than reinventing the wheel." 
am: 769a5a1962

Change-Id: I62541c0ff6961888239a7686bb37115b39fc787b
 2016-11-30 22:49:53 +00:00
Elliott Hughes
769a5a1962 Merge "Use hasmntopt(3) rather than reinventing the wheel." 2016-11-30 22:32:44 +00:00
caozhiyuan
3353d2a03c init: Fix sync issue on property trigger. 
am: 876ad4571e

Change-Id: I8a53c4728ee74a18b47b3ae8d9db6050b83ce6e2
 2016-11-30 19:12:19 +00:00
Pirama Arumuga Nainar
4c11b152ba Merge "Statically link LLVM libraries into backtrace_test" am: 9e8467a070 
am: 66d86967bd

Change-Id: Ia7973b59db8706fc6540003464ba4f79c99342d1
 2016-11-30 18:41:47 +00:00
Pirama Arumuga Nainar
a16735e36c Statically link LLVM libraries into backtrace_test am: c198b150d4 
am: 473f17cde0

Change-Id: I74a7c804446fed86a9c9f401f054ab8387d1b456
 2016-11-30 18:41:32 +00:00
Pirama Arumuga Nainar
66d86967bd Merge "Statically link LLVM libraries into backtrace_test" 
am: 9e8467a070

Change-Id: Iddd06215b4a696283f645080d4183dd524827af4
 2016-11-30 18:36:16 +00:00
Pirama Arumuga Nainar
473f17cde0 Statically link LLVM libraries into backtrace_test 
am: c198b150d4

Change-Id: I5d0db1329ac17a2a59cac589b9ab34c909f903ea
 2016-11-30 18:36:14 +00:00
Treehugger Robot
9e8467a070 Merge "Statically link LLVM libraries into backtrace_test" 2016-11-30 18:27:39 +00:00
Elliott Hughes
b94063edbf Merge "init: Fix sync issue on property trigger." am: 80d2f01fbf 
am: 65016074c2

Change-Id: I72dda41a53e95420653027176b04c7d359fa8e71
 2016-11-30 18:00:11 +00:00
Elliott Hughes
65016074c2 Merge "init: Fix sync issue on property trigger." 
am: 80d2f01fbf

Change-Id: Iae57b79abeb7a372c0e483316d328d5307c66b73
 2016-11-30 17:54:31 +00:00
caozhiyuan
876ad4571e init: Fix sync issue on property trigger. 
This issue reproduces in the following senario.
 1. ("", "") is added to queue;
 2. property_triggers_enabled is set to 1;
 3. user defined property is triggered, like sys.usb.config=adb;
 4. ("sys.usb.config", "adb") is added to queue;
 5. main loop interpret ("", "") and queue all current triggers to execution,
    so ("sys.usb.config", "adb") is queued for execution for the first time.
 6. main loop interpret ("sys.usb.config", "adb"), it is queued for
    execution for a second time.
The second time makes ASIT fail.

(cherry pick from AOSP commit b104c502e1)

Bug: http://b/28218187
Change-Id: I230e175e0dca8989f1e5bd812398da90082d0ec1
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
 2016-11-30 09:51:38 -08:00
Pirama Arumuga Nainar
c198b150d4 Statically link LLVM libraries into backtrace_test 
Bug: http://b/28866258

Remove dependency of backtrace_test on libLLVM.  Also clean up
specification for libbacktrace_offline module.  Since it is a static
library now, dependencies are only needed to automatically include
necessary headers.

Test: 32-bit and 64-bit backtrace_test passes on host and on Angler.
      mma in system/extras/simpleperf, cts/tests/tests/simpleperf
      m test-art-host

Change-Id: I76b0db14d067fa7b140a99edd237370ac04fe873
 2016-11-30 17:43:20 +00:00
Elliott Hughes
80d2f01fbf Merge "init: Fix sync issue on property trigger." 2016-11-30 17:39:55 +00:00
Elliott Hughes
8c1838823a Use hasmntopt(3) rather than reinventing the wheel. 
Bug: N/A
Test: "power off" still works
Change-Id: I11d3dc22f98ac71608c9929a3fd43319c787d49e
 2016-11-30 09:37:17 -08:00
Mark Salyzyn
2e88b5c803 Merge "libcutils: tests" am: bac388e424 
am: 6878cd20e6

Change-Id: I11758ee49eec3e19a5b9484af7c986eb3f3de769
 2016-11-30 17:34:10 +00:00
Mark Salyzyn
6878cd20e6 Merge "libcutils: tests" 
am: bac388e424

Change-Id: I86a00ea257985836400b530c1e60bdc5e070dd00
 2016-11-30 17:28:39 +00:00
Treehugger Robot
bac388e424 Merge "libcutils: tests" 2016-11-30 17:21:46 +00:00
Oleksiy Avramchenko
ac7bdd6a07 Merge "logcat: Fix --last usage option typo" am: 95a53b8b7a 
am: 8a96f5e4a7

Change-Id: I458817e1ba2407bb35d0d9dc5c9c913f40bab6d5
 2016-11-30 17:07:07 +00:00
Oleksiy Avramchenko
8a96f5e4a7 Merge "logcat: Fix --last usage option typo" 
am: 95a53b8b7a

Change-Id: Ic18c2cec4c72cd97353c22f9e41c926baac8085b
 2016-11-30 17:01:37 +00:00
Treehugger Robot
95a53b8b7a Merge "logcat: Fix --last usage option typo" 2016-11-30 16:55:23 +00:00
Mark Salyzyn
6e69c8fea6 Merge "liblog: CTS test" am: f1f7333e7c 
am: 815e0bd6fa

Change-Id: I1e33427d08b02c4128341ac98c3ce584db694b4f
 2016-11-30 16:39:06 +00:00
Mark Salyzyn
815e0bd6fa Merge "liblog: CTS test" 
am: f1f7333e7c

Change-Id: I400e7c1aa53fd431102bff843e672ee1fe49e8f7
 2016-11-30 16:34:05 +00:00
Treehugger Robot
f1f7333e7c Merge "liblog: CTS test" 2016-11-30 16:25:11 +00:00
Mark Salyzyn
966b078715 Merge "liblog: event_tag_map benchmark" am: 4afb3ef952 
am: 6b4a2ec603

Change-Id: I0cdf5e13ec1c291d4dba1bf06f7df538c8389f53
 2016-11-30 15:43:03 +00:00
Mark Salyzyn
6b4a2ec603 Merge "liblog: event_tag_map benchmark" 
am: 4afb3ef952

Change-Id: I986ef28441dc87f2ade0fd50ffceeb0a4beddf88
 2016-11-30 15:37:33 +00:00
Treehugger Robot
4afb3ef952 Merge "liblog: event_tag_map benchmark" 2016-11-30 15:31:11 +00:00
Oleksiy Avramchenko
39e2d22b93 logcat: Fix --last usage option typo 
Test: mm
Change-Id: I0b7a1615857acd4cd467f1ff1752eeae86d84eca
 2016-11-30 13:42:14 +01:00
Nick Kralevich
376aa73945 Merge "ion.c: add O_CLOEXEC to /dev/ion open" am: d91e35fb09 
am: 84ccb2dbe0

Change-Id: I87dea345156be3f0745e4df513b725fa451823b3
 2016-11-30 09:24:14 +00:00
Richard Uhler
8035a63a38 Merge "debuggerd: Dump list of open files on process crash." am: b675f7cd32 
am: 3ff028c7db

Change-Id: If0dae1f04f63d113f6414e21bcceee751f7de5c9
 2016-11-30 09:23:56 +00:00
Nick Kralevich
84ccb2dbe0 Merge "ion.c: add O_CLOEXEC to /dev/ion open" 
am: d91e35fb09

Change-Id: I97fcb4d10ae1a724fc24588f1ee3b0e783d40a62
 2016-11-30 09:19:16 +00:00
Richard Uhler
3ff028c7db Merge "debuggerd: Dump list of open files on process crash." 
am: b675f7cd32

Change-Id: Iec231fc7eb57fa2c51aabc0fb75b4a09c47004cd
 2016-11-30 09:18:57 +00:00
Treehugger Robot
d91e35fb09 Merge "ion.c: add O_CLOEXEC to /dev/ion open" 2016-11-30 07:54:48 +00:00
Treehugger Robot
b675f7cd32 Merge "debuggerd: Dump list of open files on process crash." 2016-11-30 07:53:09 +00:00
Dan Willemsen
fa807c7cad Merge changes Ia0ca36fc,Ib42c0635 am: 1abc3cd641 
am: 695e6182d3

Change-Id: Ib3ef2009d60445b1c3e1eb46a44471236df89fa7
 2016-11-30 06:12:15 +00:00
Dan Willemsen
fb1a1dbe6c Enable liblog on host bionic am: 0910d2dbb9 
am: 32010171bd

Change-Id: I8d4c144679670f9b58e9b258626cf03459af85a3
 2016-11-30 06:12:07 +00:00
Dan Willemsen
5bc670c841 Enable libbase/libutils/libziparchive on host bionic am: ab34b47b35 
am: 69b0123549

Change-Id: Ib9c0d6d9912617c95c75018248b069e254bcdb11
 2016-11-30 06:12:00 +00:00
Dan Willemsen
695e6182d3 Merge changes Ia0ca36fc,Ib42c0635 
am: 1abc3cd641

Change-Id: I67bfecac71d4fef20835dab3d226ec3d54847fa0
 2016-11-30 06:06:07 +00:00
Dan Willemsen
32010171bd Enable liblog on host bionic 
am: 0910d2dbb9

Change-Id: I127b74998a678bc69c70cabcbdcf5586feb80172
 2016-11-30 06:06:06 +00:00
Dan Willemsen
69b0123549 Enable libbase/libutils/libziparchive on host bionic 
am: ab34b47b35

Change-Id: If8e762eace58a494efede9ef5cb09be99b74e5b8
 2016-11-30 06:05:59 +00:00
Treehugger Robot
1abc3cd641 Merge changes Ia0ca36fc,Ib42c0635 
* changes:
  Enable liblog on host bionic
  Enable libbase/libutils/libziparchive on host bionic
 2016-11-30 05:59:53 +00:00
Daniel Rosenberg
8c0d6338f3 Merge "Switch sdcardfs over to bind mounts." am: 94b9e4df04 
am: 895cd44bd9

Change-Id: I33328d236f0ccfb9f65cfdc90d626a8561c032a1
 2016-11-30 05:26:10 +00:00
Daniel Rosenberg
895cd44bd9 Merge "Switch sdcardfs over to bind mounts." 
am: 94b9e4df04

Change-Id: I2dc89613d382ea5fd86bd1a1736310d3e8e49dbc
 2016-11-30 05:20:40 +00:00
Treehugger Robot
94b9e4df04 Merge "Switch sdcardfs over to bind mounts." 2016-11-30 05:15:33 +00:00
Nick Kralevich
1523ff3952 Merge "delete toolbox/r.c" am: 08f0c4c998 
am: 604ed83934

Change-Id: I501fbb275af584fdc60bfde9c3b13cc75c3d6f27
 2016-11-30 04:37:54 +00:00
Nick Kralevich
604ed83934 Merge "delete toolbox/r.c" 
am: 08f0c4c998

Change-Id: I2725b81599d2b90473a96e0748911ca3bbf46211
 2016-11-30 04:32:54 +00:00
Treehugger Robot
08f0c4c998 Merge "delete toolbox/r.c" 2016-11-30 04:27:32 +00:00
Josh Gao
effc9de94a Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d 
am: 79517d4f9f

Change-Id: I8d7b80219e3292bbca47626f89c66c512a80abd2
 2016-11-30 03:24:30 +00:00
Josh Gao
d85207481e adb: actually fix the windows build. am: 58eda35ace am: bbd6d7b3e7 am: 1ceca95f8e am: 0d5c1a7745 -s ours am: 8621700765 am: d0b35e9e1d am: 08420b5826 am: c80cd472c7 am: 257ae8c6b9 am: 6cac5c9815 am: d1a9747589 am: a97e943936 am: 77837ee280 
am: 8dab84a673

Change-Id: I34dae711685efe971b6161d41e59a1738a758b28
 2016-11-30 03:24:14 +00:00