Commit graph

27583 commits

Author SHA1 Message Date
Treehugger Robot
56098eed3b Merge "init: usb: fix audio_source function typo" 2017-01-18 01:39:39 +00:00
James Hawkins
7cab73aeba Merge "bootstat: Fix false metrics due to soft reboots." am: bde89da5fc am: c5129582bb
am: 18d75b1ab3

Change-Id: I05d8cc087f648e6d8e22414e7d96a1385e1ac8e4
2017-01-17 23:54:14 +00:00
James Hawkins
18d75b1ab3 Merge "bootstat: Fix false metrics due to soft reboots." am: bde89da5fc
am: c5129582bb

Change-Id: I908178abf95cd8e2997c9eabe42a05547f25e820
2017-01-17 23:52:13 +00:00
James Hawkins
c5129582bb Merge "bootstat: Fix false metrics due to soft reboots."
am: bde89da5fc

Change-Id: I4c49fff20f78e4bff744dfe94a7207cf7e151404
2017-01-17 23:50:15 +00:00
James Hawkins
bde89da5fc Merge "bootstat: Fix false metrics due to soft reboots." 2017-01-17 23:46:58 +00:00
Gustavo Padovan
801492b8a6 libsync: tests: redefine PollOnDestroyedTimeline()
On mainline if the sw_sync timeline is destroyed the fences doesn't not
signal or error. So change the test to check if the fence is still there
by polling the fence with timeout zero and asserting if it is not
signalled.

Test: Sync unit tests still passes.
Change-Id: Icb8e629018eef35074ae91d0f29ed1f12e90492b
2017-01-17 14:29:41 -08:00
Gustavo Padovan
e4682802cb libsync: tests: remove WaitOnDestroyedTimeline test
The mainline Sync File implementation doesn't have wait ioctl anymore.
Only poll is supported now, and we already have a test for that.

Test: Sync unit tests still passes.
Change-Id: Iadde7b2173024af9b8d20316e640297cf214c645
2017-01-17 14:29:18 -08:00
Gustavo Padovan
61ab0d74d2 libsync: add support to new Sync API
Change libsync functions in a way that it can run dynamically on both
APIs.

v2: fix whitespace changes and poll return handling

v3: handle error cases on sync_wait()

Test: Sync unit tests still passes.
Change-Id: I743ab92ce39cbfa75dca41dd0a435efa9f2aab66
hange-Id: Ib56f2c6441b41028bc9f66998676790b7713988a
2017-01-17 14:29:01 -08:00
Gustavo Padovan
ffc687baad libsync: open new location of sw_sync file
sw_sync file for debug was moved to debugfs. Try to open it and if it
fails try to open /dev/sw_sync.

Test: Sync unit tests still passes.
Change-Id: Ie078fbc2eb5294f28b916a9e65b7fcd3a18a8580
hange-Id: I216874964368d939bed2779d98cd89e527a57d45
2017-01-17 14:28:45 -08:00
Gustavo Padovan
6786575d42 libsync: add new Sync kernel API
Add the new API to the internal sync.h file. As there is two different
APIs we will need to discovery dynamically which one to use.

v2: Fix Documentation

Test: Sync unit tests still passes.
Change-Id: I2ab3cd46e48ba5d9c73d54f9583b1a8141566581
2017-01-17 14:28:26 -08:00
Gustavo Padovan
d6bbc5de66 libsync: move kernel headers for sync ioctls to sync.h
This patch moves the legacy API to the internal sync.h header
and add documentation to it.

Test: Sync unit tests still passes.
Change-Id: I9b17eb23af30043b3df5fb9e857affad68ba8521
2017-01-17 14:28:00 -08:00
Winter Wang
60c763ed52 init: usb: fix audio_source function typo
for audio_source function instance, there exist 2 function name here:
    "audio_source.gs2" and "audio_source.gs3"
I believe this usb accessory audio name "audio_source.gs2" is a typo,
as there is no need to create another audio_source instance.

Test: Manual

Change-Id: I70b513db474632eb990131c285c8d5105c17970f
Signed-off-by: Winter Wang <wente.wang@nxp.com>
2017-01-17 14:27:34 -08:00
Josh Gao
cbe70cb0a8 debuggerd: advance our amazing bet.
Remove debuggerd in favor of a helper process that gets execed by
crashing processes.

Bug: http://b/30705528
Test: debuggerd_test
Change-Id: I9906c69473989cbf7fe5ea6cccf9a9c563d75906
2017-01-17 13:57:57 -08:00
James Hawkins
800ceb45b1 bootstat: Fix false metrics due to soft reboots.
Use a flag to enable/disable logging metrics, set to false during soft
reboots.

Bug: 32807863
Change-Id: Ib1359327af4e18d40400c29961c454f7be1b8d0c
Test: None
2017-01-17 13:28:17 -08:00
TreeHugger Robot
3e775c3e05 Merge "dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH" into nyc-mr2-dev-plus-aosp 2017-01-17 20:56:17 +00:00
Android Build Merger (Role)
8f8dc01b3a Merge changes from topic 'am-a4406a3abc304bda91eea9becf864ba6' into nyc-mr2-dev-plus-aosp
* changes:
  dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH am: 00d5dad56f
  Make dlext_namespaces.h available to users of libnativeloader am: 243bbd29d6  -s ours
2017-01-17 20:32:28 +00:00
Jesse Hall
bfbfeb264b dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH
am: 00d5dad56f

Change-Id: Id30495dcc6e5142bce24deca8b9527126b14de97
2017-01-17 20:31:58 +00:00
Jesse Hall
02672ee459 Make dlext_namespaces.h available to users of libnativeloader
am: 243bbd29d6  -s ours

Change-Id: Id47c7f0f7f1f911404f3f7cb49ed5c91b53695ec
2017-01-17 20:31:53 +00:00
Tao Bao
6d28c37ef8 Merge "Revert "init: add ro.boot.init_rc"" am: 4c5c9db17b am: bd8a24e292
am: 94c57f7f23

Change-Id: I2bb227c4165ddb438a3020f3e4874975dc1b1368
2017-01-17 20:31:29 +00:00
Tao Bao
94c57f7f23 Merge "Revert "init: add ro.boot.init_rc"" am: 4c5c9db17b
am: bd8a24e292

Change-Id: I0599a01f0d46f869227330b8cdcd5542dc75a448
2017-01-17 20:28:03 +00:00
Tao Bao
bd8a24e292 Merge "Revert "init: add ro.boot.init_rc""
am: 4c5c9db17b

Change-Id: I837b786637e5862cbad3338d053ce9b8c730241b
2017-01-17 20:25:29 +00:00
Jesse Hall
acde20c027 dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH
This allows clients creating their own namespace do so by modifying
the default library path, rather than hardcoding it multiple places in
the system.

Bug: 33531483
Test: build
Change-Id: I321e219392b38c235b220986e1520b49a4669863
(cherry picked from commit 823c266a8a)
2017-01-17 20:23:16 +00:00
Tao Bao
4c5c9db17b Merge "Revert "init: add ro.boot.init_rc"" 2017-01-17 20:19:23 +00:00
Tao Bao
01519a207c Revert "init: add ro.boot.init_rc"
This reverts commit 7e6d30e5f2.

Bug: 26639863
Bug: 34318089
Change-Id: Ie71d773ee7c6c6a90e8298f8e0798eacba12d0be
2017-01-17 20:16:45 +00:00
Jesse Hall
19e105bc0a Make dlext_namespaces.h available to users of libnativeloader
Bug: 33531483
Test: build
Change-Id: I1da92e2b1437b6775a9d81fc6c1a2d4bacecbc04
(cherry picked from commit 0936d25371)
2017-01-17 19:28:20 +00:00
Jesse Hall
00d5dad56f dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH
This allows clients creating their own namespace do so by modifying
the default library path, rather than hardcoding it multiple places in
the system.

Bug: 33531483
Change-Id: Id93059eed9f426b05178ecd65861f820300f0382
Merged-In: I321e219392b38c235b220986e1520b49a4669863
2017-01-17 09:33:04 -08:00
Jesse Hall
243bbd29d6 Make dlext_namespaces.h available to users of libnativeloader
Bug: 33531483
Change-Id: Ie53309a08179770fa2b53b937580fe9e7acf748d
Merged-In: I1da92e2b1437b6775a9d81fc6c1a2d4bacecbc04
2017-01-17 09:32:25 -08:00
Elliott Hughes
5c25f72e24 Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." am: c160675a93 am: ed67c75206
am: 1b4ef805b1

Change-Id: I305cf0b3df95433d387f306daac774fa13d0854f
2017-01-16 18:27:32 +00:00
Elliott Hughes
1b4ef805b1 Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." am: c160675a93
am: ed67c75206

Change-Id: I678bb3273f427eb6ae86b3ae553d64e612ab04a4
2017-01-16 18:22:32 +00:00
Elliott Hughes
ed67c75206 Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry."
am: c160675a93

Change-Id: Ic8e6d589d3a6bbc630202356d85851ed5729e22c
2017-01-16 18:18:03 +00:00
Treehugger Robot
c160675a93 Merge "Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry." 2017-01-16 18:10:46 +00:00
Elliott Hughes
ebeaa67c0c Remove fs_mgr's bogus external/openssl/include LOCAL_C_INCLUDES entry.
Bug: N/A
Test: builds
Change-Id: Icaf095f0c25fae5c1175dbb630bc05c63af72d75
2017-01-15 11:52:35 -08:00
Elliott Hughes
8d47d408fb Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e am: e7c8bb473e
am: 4b7ba78fe2

Change-Id: I794386ae55a3faf0c6bc087dc77405e10244bc48
2017-01-14 18:32:20 +00:00
Elliott Hughes
4b7ba78fe2 Merge "bootable/recovery wants EqualsIgnoreCase." am: 89e99f9e0e
am: e7c8bb473e

Change-Id: I07552a5fa16fc66b6379f6b44a97f59e1b712b7a
2017-01-14 18:29:20 +00:00
Elliott Hughes
e7c8bb473e Merge "bootable/recovery wants EqualsIgnoreCase."
am: 89e99f9e0e

Change-Id: Id7480e1a1fec5626a0bec22c2128dd419533e1aa
2017-01-14 18:26:21 +00:00
Elliott Hughes
89e99f9e0e Merge "bootable/recovery wants EqualsIgnoreCase." 2017-01-14 18:22:32 +00:00
Hung-ying Tyan
1f873c02e2 Merge "init: add ro.boot.init_rc" am: 0cf5e36c00 am: 1d1b981f95
am: a83586c1ed

Change-Id: Iaab9d1b4cc1055a91624815463a656e6fce8621b
2017-01-14 08:17:08 +00:00
Hung-ying Tyan
a83586c1ed Merge "init: add ro.boot.init_rc" am: 0cf5e36c00
am: 1d1b981f95

Change-Id: If7afdc62ddea990a00713c548575c945a73022e4
2017-01-14 08:14:09 +00:00
Hung-ying Tyan
1d1b981f95 Merge "init: add ro.boot.init_rc"
am: 0cf5e36c00

Change-Id: I14b7e7d7bb7d98fac9126a0a1e624bb180529028
2017-01-14 08:11:37 +00:00
Treehugger Robot
0cf5e36c00 Merge "init: add ro.boot.init_rc" 2017-01-14 08:06:09 +00:00
Elliott Hughes
13b71453fa Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74 am: 5bdade8a93
am: cf24be99bb

Change-Id: I7d3bd8f949d4b7607747916b541b8c2b80807598
2017-01-14 03:00:24 +00:00
Elliott Hughes
cf24be99bb Merge "-e is really about TCP/IP devices, not emulators." am: f28f7c8a74
am: 5bdade8a93

Change-Id: I0ca6a8824a2f89867e85fea6ee8d97f6dd3a1acf
2017-01-14 02:57:53 +00:00
Elliott Hughes
2140782d24 bootable/recovery wants EqualsIgnoreCase.
Bug: N/A
Test: ran tests
Change-Id: I4a6ee9eba0514b8bb8fb0489f4d370964ce9c1c2
2017-01-13 18:51:32 -08:00
Elliott Hughes
5bdade8a93 Merge "-e is really about TCP/IP devices, not emulators."
am: f28f7c8a74

Change-Id: I9c15948b84956030eec73358cc6454ed8a16d9bc
2017-01-14 02:51:22 +00:00
Treehugger Robot
f28f7c8a74 Merge "-e is really about TCP/IP devices, not emulators." 2017-01-14 02:47:21 +00:00
Elliott Hughes
539abc8d8d Merge "Switch fastboot docs to markdown." am: e94deb3a51 am: b095bf0cf9
am: b21ae4f2d1

Change-Id: I325fe41a36fad6477b01fb3bfb8b56fb1c953855
2017-01-14 02:31:51 +00:00
Elliott Hughes
b21ae4f2d1 Merge "Switch fastboot docs to markdown." am: e94deb3a51
am: b095bf0cf9

Change-Id: Ic24455280f62447c2697d2476debe446d1a50e1c
2017-01-14 02:29:50 +00:00
Elliott Hughes
b095bf0cf9 Merge "Switch fastboot docs to markdown."
am: e94deb3a51

Change-Id: Ib9e354ecde88cfe914e95b5ab1e2ab41aad8022d
2017-01-14 02:26:51 +00:00
Elliott Hughes
e94deb3a51 Merge "Switch fastboot docs to markdown." 2017-01-14 02:23:44 +00:00
Elliott Hughes
83ab5c29c1 -e is really about TCP/IP devices, not emulators.
Despite the name.

Bug: N/A
Test: N/A
Change-Id: I099222137fabf68f961a6a2e5d11f2904ffd5a0d
2017-01-13 16:58:25 -08:00