Commit graph

57885 commits

Author SHA1 Message Date
Tej Singh
a8fd39d83f Expose libstatspull as a stable C API
Libstatspull will ship as a part of the statsd apex in R.

Also update libstatssocket to have version 30 to align with api level,
as per native api council feedback.

Change both libraries to use NDK style naming conventions (AStatsEvent,
AStatsManager), and remove unneeded APIs in libstatssocket.

Remove KeyValuePairs from libstatssocket. KeyValuePairs will not be
supported in native code.

Bug: 147499386
Test: make libstatspull
Test: make libstatssocket
Test: atest libstatssocket_test
Change-Id: Ie79771461215a057529aaac91db95e4334c3960e
2020-02-04 14:07:35 -08:00
Automerger Merge Worker
98027bf9c2 Merge "task_profiles.json: Fix uclamp attribute" am: 44da3704f7 am: 16dbe5dedd am: cccc591435
Change-Id: I2630dee125931200837bf466dd04c383024f8d68
2020-02-04 18:26:16 +00:00
Automerger Merge Worker
cccc591435 Merge "task_profiles.json: Fix uclamp attribute" am: 44da3704f7 am: 16dbe5dedd
Change-Id: I3b9554ef08f439d53054259d010b109884d0a7f1
2020-02-04 18:12:36 +00:00
Automerger Merge Worker
16dbe5dedd Merge "task_profiles.json: Fix uclamp attribute" am: 44da3704f7
Change-Id: I1b22629b71508585b04e04f87745d8f3ea54c18f
2020-02-04 18:00:15 +00:00
Treehugger Robot
44da3704f7 Merge "task_profiles.json: Fix uclamp attribute" 2020-02-04 17:50:11 +00:00
Quentin Perret
20b2f1e0ab task_profiles.json: Fix uclamp attribute
task_profiles.json currently uses attributes of a defunct version of
uclamp, which was used for testing.

Let's use the attributes that actually got merged upstream instead.

Bug: 143710295
Change-Id: Ic6a14f52e14efeefc91f6e6bf580c15e2eded82e
Signed-off-by: Quentin Perret <qperret@google.com>
2020-02-04 13:10:31 +00:00
Automerger Merge Worker
eabfab94ee Merge "Add libadbd_auth to adbd's required list." am: 955601beb4 am: 4a0bbf0838 am: 023d78872b
Change-Id: I19135dbbdc39efda1607ebd74cdce1afe0041c0d
2020-02-04 10:47:28 +00:00
Automerger Merge Worker
023d78872b Merge "Add libadbd_auth to adbd's required list." am: 955601beb4 am: 4a0bbf0838
Change-Id: Ibf2de419604d7041b0ddfeb5a5addb5deff6cd59
2020-02-04 10:38:53 +00:00
Automerger Merge Worker
4a0bbf0838 Merge "Add libadbd_auth to adbd's required list." am: 955601beb4
Change-Id: I0d2443f77cd44ec8766ba89ed6419cc7ea97504e
2020-02-04 10:29:18 +00:00
Josh Gao
955601beb4 Merge "Add libadbd_auth to adbd's required list." 2020-02-04 10:16:41 +00:00
Josh Gao
9952258416 Add libadbd_auth to adbd's required list.
It seems like we might not be tracking dependencies properly on
devices with flattened APEXes? Add libadbd_auth to adbd's required
list to work around this for now.

Bug: http://b/148812347
Test: `ls $ANDROID_PRODUCT_OUT/system/lib/libadbd_auth.so` before and after when building a go device
Change-Id: If60abeb00797e37bf6a5a037249a21877e0b3d26
2020-02-04 07:17:19 +00:00
Automerger Merge Worker
544aad113e Merge "Mount binderfs" am: b970633642 am: 545c380d43 am: ee99863698
Change-Id: I2a3bf05e91f67a8646c692544856d21f0def05bc
2020-02-04 01:22:21 +00:00
Automerger Merge Worker
ee99863698 Merge "Mount binderfs" am: b970633642 am: 545c380d43
Change-Id: If37098bf1f8ce910dfeb360fdb3e0801083039b7
2020-02-04 01:06:52 +00:00
Automerger Merge Worker
545c380d43 Merge "Mount binderfs" am: b970633642
Change-Id: Id6892daceffdf3b9288761ecc55045e2e5c37ca2
2020-02-04 00:57:37 +00:00
Treehugger Robot
b970633642 Merge "Mount binderfs" 2020-02-04 00:50:10 +00:00
Automerger Merge Worker
d4345ac647 Merge "Add adbd_test to mts." am: d0854b3397 am: 80183a10cd am: ed60f2a2c6
Change-Id: Iaff793761dbfbe74df84cb9b7627ec33e1b6e776
2020-02-03 23:51:34 +00:00
Automerger Merge Worker
bd2fbb6d78 Merge "Add support for casefold and product ID to format" am: 2e10d8f74f am: c50d82e418 am: 43587ec66d
Change-Id: I80632b75f5f216a8b63b510e27628556aae126f9
2020-02-03 23:51:26 +00:00
Automerger Merge Worker
ed60f2a2c6 Merge "Add adbd_test to mts." am: d0854b3397 am: 80183a10cd
Change-Id: Ie327a3500a62223fb734ce144472169432e4031a
2020-02-03 23:46:11 +00:00
Automerger Merge Worker
80183a10cd Merge "Add adbd_test to mts." am: d0854b3397
Change-Id: I5a6c747472a69cd80962e5681ce5b626ff88d879
2020-02-03 23:40:19 +00:00
Automerger Merge Worker
43587ec66d Merge "Add support for casefold and product ID to format" am: 2e10d8f74f am: c50d82e418
Change-Id: Ifc48930d146f940a5339da579f05978992e3431a
2020-02-03 23:40:08 +00:00
Josh Gao
d0854b3397 Merge "Add adbd_test to mts." 2020-02-03 23:30:12 +00:00
Automerger Merge Worker
c50d82e418 Merge "Add support for casefold and product ID to format" am: 2e10d8f74f
Change-Id: I06c6d888848c4a138729c560af21f9f984f793bb
2020-02-03 23:24:09 +00:00
Daniel Rosenberg
2e10d8f74f Merge "Add support for casefold and product ID to format" 2020-02-03 23:12:15 +00:00
Automerger Merge Worker
5febbd2a84 Merge "Add libdm_test to presubmit" am: be074feb93 am: 5ef6de1910 am: 5e577a3d00
Change-Id: Ia65b95a9140b525b6363cbc4268f9e65f592befe
2020-02-03 22:24:27 +00:00
Hridya Valsaraju
b237d76ae5 Mount binderfs
Mount binderfs at /dev/binderfs. Also add symlinks from /dev/binder,
/dev/hwbinder and /dev/vndbinder to /dev/binderfs/binder,
/dev/binderfs/hwbinder and /dev/binderfs/vndbinder respectively.

The symlink commands will fail harmlessly on a kernel
which does not support binderfs since /dev/{binder,hwbinder,vndbinder}
devices will exist on the same.

Bug: 136497735
Bug: 148696163

Test: Cuttlefish boots on Android Common Kernel 4.19 with kernel config
CONFIG_ANDROID_BINDERFS=y.

Change-Id: I8e04340dc4622b0a3c1fc4aa6bbefcb24eefe00b
2020-02-03 22:14:21 +00:00
Automerger Merge Worker
5e577a3d00 Merge "Add libdm_test to presubmit" am: be074feb93 am: 5ef6de1910
Change-Id: I27133c12898bcbe0b9a6041b83640e5a14ca3334
2020-02-03 22:13:33 +00:00
Automerger Merge Worker
5ef6de1910 Merge "Add libdm_test to presubmit" am: be074feb93
Change-Id: I397b1ab1375ce85fa98e908d931ac133cddaa942
2020-02-03 22:04:13 +00:00
Treehugger Robot
be074feb93 Merge "Add libdm_test to presubmit" 2020-02-03 21:55:39 +00:00
Automerger Merge Worker
550a6525be Merge "adbd: actually dynamically link against libadbd_auth." am: d5bad7c021 am: e263f4d717 am: c525814b95
Change-Id: Ie6f420b87a7347f365316a885fcabfc1c90a56d9
2020-02-03 20:38:42 +00:00
Automerger Merge Worker
35048440a8 Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6 am: da06572d74 am: 4e5dbfbb27
Change-Id: I43ad7e3b6e2f081c2021b7d53717daf21a62564b
2020-02-03 20:38:30 +00:00
Automerger Merge Worker
c525814b95 Merge "adbd: actually dynamically link against libadbd_auth." am: d5bad7c021 am: e263f4d717
Change-Id: Ib86dd2ad62e68e774e4275ed6bbc2c5e7d450dd8
2020-02-03 20:29:08 +00:00
Automerger Merge Worker
4e5dbfbb27 Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6 am: da06572d74
Change-Id: I55b0d036290c92593e1920f337ecfe6213708f29
2020-02-03 20:28:57 +00:00
Automerger Merge Worker
e263f4d717 Merge "adbd: actually dynamically link against libadbd_auth." am: d5bad7c021
Change-Id: Ica9eb1a9bdb4fcd6998493adb845e9ade8c4e3c2
2020-02-03 20:17:53 +00:00
Automerger Merge Worker
da06572d74 Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6
Change-Id: I679ee467be42ae1955992ff5f664cff8071d5d5b
2020-02-03 20:17:43 +00:00
Automerger Merge Worker
9f4e6f5acb Merge "The darwin linker does not support version scripts" am: a911933a23 am: aa07f58bcf am: ab0a3cd806
Change-Id: I970c526e9c1454feff625e1207ac0ba9660a7a63
2020-02-03 20:17:38 +00:00
Josh Gao
d5bad7c021 Merge "adbd: actually dynamically link against libadbd_auth." 2020-02-03 20:15:20 +00:00
Automerger Merge Worker
ab0a3cd806 Merge "The darwin linker does not support version scripts" am: a911933a23 am: aa07f58bcf
Change-Id: Id8befbc8dcfcb9e543be0b500f6f7892fcda3f4f
2020-02-03 20:08:17 +00:00
Treehugger Robot
962e3ddfd6 Merge "Missing UpdateState::Cancelled string conversions" 2020-02-03 20:03:56 +00:00
Automerger Merge Worker
aa07f58bcf Merge "The darwin linker does not support version scripts" am: a911933a23
Change-Id: I34ed28be53c24fefca39adc43f6a383aab9acce7
2020-02-03 19:57:14 +00:00
Treehugger Robot
a911933a23 Merge "The darwin linker does not support version scripts" 2020-02-03 19:48:25 +00:00
Automerger Merge Worker
5c008e71a0 [automerger skipped] Move gcov output to /data/misc/trace am: e6fa0a6af2 am: 101e437515 -s ours am: a8d1de50a9 -s ours
am skip reason: Change-Id Ia6b94e26352dd66f5c6819f6157b4b73dd777a90 with SHA-1 360eb055e0 is in history

Change-Id: Ie82a968077becd21631ff8820cd7f953d2842791
2020-02-03 19:34:40 +00:00
Automerger Merge Worker
75f7c725ab [automerger skipped] Merge "Revert "Mount binderfs"" am: 823beae16a am: 146d595675 am: 8be750eb39 -s ours
am skip reason: Change-Id I97e96bd86d02a9fe70c5ef02df85c604b0cfb3c3 with SHA-1 186b5798d2 is in history

Change-Id: Ie5032161010ba6097a7b70e0762623ebfff6c515
2020-02-03 19:34:32 +00:00
Automerger Merge Worker
9a97e3bdb2 Merge "charger: uses health HAL service." am: 3d3165702b am: 3e5a1289b9 am: 121aae986f
Change-Id: Idceff62e112e11c9f7454be8ac71a53e59514a24
2020-02-03 19:34:14 +00:00
Automerger Merge Worker
a8d1de50a9 [automerger skipped] Move gcov output to /data/misc/trace am: e6fa0a6af2 am: 101e437515 -s ours
am skip reason: Change-Id Ia6b94e26352dd66f5c6819f6157b4b73dd777a90 with SHA-1 360eb055e0 is in history

Change-Id: Ifb49301ec0be2d24b54314f2467654ad26d79a29
2020-02-03 19:32:12 +00:00
Automerger Merge Worker
101e437515 Move gcov output to /data/misc/trace am: e6fa0a6af2
Change-Id: I8294c4704ae3f3eaaa997aa1e2c4504b811cca03
2020-02-03 19:16:54 +00:00
Automerger Merge Worker
8be750eb39 Merge "Revert "Mount binderfs"" am: 823beae16a am: 146d595675
Change-Id: I13c3a172a4f6d9d2325ee4a6f1fd0f94550aede9
2020-02-03 18:58:35 +00:00
Automerger Merge Worker
146d595675 Merge "Revert "Mount binderfs"" am: 823beae16a
Change-Id: Ifaab3af435cca160897c56ba0ca1251726a50c53
2020-02-03 18:49:39 +00:00
Treehugger Robot
823beae16a Merge "Revert "Mount binderfs"" 2020-02-03 18:37:40 +00:00
Automerger Merge Worker
121aae986f Merge "charger: uses health HAL service." am: 3d3165702b am: 3e5a1289b9
Change-Id: Ib0e30b9636e3cf1f6863a2f789ac5fa39141ffd9
2020-02-03 18:33:30 +00:00
Automerger Merge Worker
a7bc3cff02 Merge "Allow apexd to snapshot and restore DE data." am: 0460f65f78 am: 6a97572d2e am: 9f6a18dff1
Change-Id: Ia493eb31e34afb151c5b96984f101a55ddd80e08
2020-02-03 18:22:14 +00:00