Christopher Ferris
7b20dc42c1
Merge "Add support for only a .eh_frame." am: 58fb262613
am: fa9d130401
...
am: 5d8dded5cf
Change-Id: Ia0f8d1b67c01746823319d8edde5b43b444d328e
2017-11-08 15:42:27 +00:00
Christopher Ferris
5d8dded5cf
Merge "Add support for only a .eh_frame." am: 58fb262613
...
am: fa9d130401
Change-Id: Ie2706499c372b013853043d06fe6f3933692988c
2017-11-08 15:37:56 +00:00
Christopher Ferris
fa9d130401
Merge "Add support for only a .eh_frame."
...
am: 58fb262613
Change-Id: Ia7a08d419e86037765396de32e4810f4cdae8202
2017-11-08 15:35:18 +00:00
Christopher Ferris
58fb262613
Merge "Add support for only a .eh_frame."
2017-11-08 15:31:07 +00:00
Luis Hector Chavez
b7d8c86bc3
Merge changes from topic "uevent" am: 28e09852bf
am: a111a5b56c
...
am: b6d2b3b608
Change-Id: I61eb402fbcf3def6986f51707efc6e87e444c86e
2017-11-08 02:18:45 +00:00
Luis Hector Chavez
b6d2b3b608
Merge changes from topic "uevent" am: 28e09852bf
...
am: a111a5b56c
Change-Id: Ie97064431c6c4b098f8c9e416ae20ef722e6f77c
2017-11-08 01:52:10 +00:00
Josh Gao
72695fd296
Merge "crash_dump: don't inherit environment from parent." am: dbef1eeb45
am: fe7b4a5cf9
...
am: 7af3890bcf
Change-Id: Ib53ea9419fe51498416080b6c28f0fb5fe15b827
2017-11-08 01:51:18 +00:00
Luis Hector Chavez
a111a5b56c
Merge changes from topic "uevent"
...
am: 28e09852bf
Change-Id: Ibd9e6abb00d64dcc0c8831c6326a98f942b12d48
2017-11-08 01:46:32 +00:00
Treehugger Robot
28e09852bf
Merge changes from topic "uevent"
...
* changes:
libcutils: Work around the lack of __mulodi4
libcutils: Make uevent_kernel_* namespace-aware
2017-11-08 01:39:35 +00:00
Josh Gao
7af3890bcf
Merge "crash_dump: don't inherit environment from parent." am: dbef1eeb45
...
am: fe7b4a5cf9
Change-Id: I6df564cf6c384442f504be25ee4262e525ada44a
2017-11-08 01:21:24 +00:00
Josh Gao
fe7b4a5cf9
Merge "crash_dump: don't inherit environment from parent."
...
am: dbef1eeb45
Change-Id: I76fd7f69d525c7d80922a9be42e10a5471ed628f
2017-11-08 01:10:38 +00:00
Treehugger Robot
dbef1eeb45
Merge "crash_dump: don't inherit environment from parent."
2017-11-08 00:44:47 +00:00
TreeHugger Robot
c7bd7fefd6
Merge "Added get descriptors length function to enable direct access to raw descriptors."
2017-11-07 21:25:07 +00:00
Christopher Ferris
c9dee84d81
Add support for only a .eh_frame.
...
Static executables only have a .eh_frame section and no .eh_frame_hdr
section. Add support for this by rearranging the class hierarchy and
creating a DwarfEhFrameWithHdr class and a DwarfEhFrame class to handle
the different cases.
Add new unit tests for DwarfEhFrame and for the new functionality.
Bug: 68820189
Test: Passes new unit tests, unwinds static executables.
Change-Id: I63d7cb8c52a686e96579a2266e18c0d06bbb6e63
2017-11-07 13:22:39 -08:00
Miodrag Dinic
10f71df97e
Merge "MIPS[64]: codeflinger: Fix build due to unused variable warnings" am: 1e0b9672de
am: 50c1ad48cd
...
am: 173f91c9c8
Change-Id: I46ea28e440be983bd2da9f9a6d90176f08882d7a
2017-11-07 20:47:09 +00:00
Christopher Ferris
072095a46d
Merge "Fix nullptr dereference." am: 8e1ac14f40
am: 209841d764
...
am: 9a0ea3ee7a
Change-Id: Id6f9de2a965021360661c00c167db939e0a04ece
2017-11-07 20:46:06 +00:00
Miodrag Dinic
173f91c9c8
Merge "MIPS[64]: codeflinger: Fix build due to unused variable warnings" am: 1e0b9672de
...
am: 50c1ad48cd
Change-Id: I642b1ce78a8966de10a839c3023259f645d2cb0f
2017-11-07 20:42:37 +00:00
Christopher Ferris
9a0ea3ee7a
Merge "Fix nullptr dereference." am: 8e1ac14f40
...
am: 209841d764
Change-Id: Ifef7ecdcda2d52abe15113fcfdc148e3208e9d9d
2017-11-07 20:41:49 +00:00
Miodrag Dinic
50c1ad48cd
Merge "MIPS[64]: codeflinger: Fix build due to unused variable warnings"
...
am: 1e0b9672de
Change-Id: Iaa3c0c2a7dc56a55a0544e43f6ff963af4c05d6d
2017-11-07 20:39:22 +00:00
Christopher Ferris
209841d764
Merge "Fix nullptr dereference."
...
am: 8e1ac14f40
Change-Id: I87d9a8c5fd09a717a119273c8a3f8d3a463e8e6c
2017-11-07 20:38:47 +00:00
Treehugger Robot
1e0b9672de
Merge "MIPS[64]: codeflinger: Fix build due to unused variable warnings"
2017-11-07 20:34:34 +00:00
Christopher Ferris
8e1ac14f40
Merge "Fix nullptr dereference."
2017-11-07 20:30:42 +00:00
Elliott Hughes
96b2532c57
Merge "Don't include the build number in the adbd binary." am: d9984743e6
am: e8873379bc
...
am: c330fcdf17
Change-Id: I22d309891b2293bbc1ed9e7f4354d8875629c496
2017-11-07 20:19:35 +00:00
Elliott Hughes
c330fcdf17
Merge "Don't include the build number in the adbd binary." am: d9984743e6
...
am: e8873379bc
Change-Id: Ib2890bf418820cdc7709b52bf33a7d7340cdac63
2017-11-07 20:16:20 +00:00
Elliott Hughes
e8873379bc
Merge "Don't include the build number in the adbd binary."
...
am: d9984743e6
Change-Id: Ifae8f8f4bd633aca5bb2096e0447b10c2accf1f5
2017-11-07 20:13:52 +00:00
Treehugger Robot
d9984743e6
Merge "Don't include the build number in the adbd binary."
2017-11-07 20:04:40 +00:00
Elliott Hughes
6b970212fd
Don't include the build number in the adbd binary.
...
We want repeatable builds for minimal OTAs.
(cherrypick of 2e93eda69cf20d9c04d56ea6bf1e2ea62ad62eb4.)
Bug: http://b/64634017
Bug: 64709603 (presubmit balking at the line above)
Test: repeated builds after `touch daemon/main.cpp` keep same md5sum
Change-Id: Iedeb44377ea45bbf20e2212760802198a57dc14a
2017-11-07 10:57:36 -08:00
Jin Qian
0700f3b863
Merge "storaged: fix regression found in unit-test"
2017-11-07 07:54:16 +00:00
Yifan Hong
e3526facb5
Merge changes from topic "health2-health1"
...
* changes:
storaged: update for using 1.0::HealthInfo.
Health@2.0: uses @1.0::HealthInfo
2017-11-07 06:42:13 +00:00
Yifan Hong
a8a67ca103
Merge "do not getTransport before getting IHealth service."
2017-11-07 06:41:18 +00:00
Yifan Hong
348bc20bf8
storaged: update for using 1.0::HealthInfo.
...
Test: boots
Bug: 63702641
Change-Id: I97e322af97347c603f10b5b5b82cd3ae52c58b8f
2017-11-06 13:14:18 -08:00
Yifan Hong
1106e83c54
Health@2.0: uses @1.0::HealthInfo
...
Revert "Update for expanding @2.0::HealthInfo."
BatteryService does not use these fields for posting
sticky intents.
This reverts commit be17a4f235
.
Test: boots
Bug: 63702641
Change-Id: I4df61645ab38a8e205ee21efc86bbef3e39674ab
2017-11-06 13:13:15 -08:00
Paul McLean
baea1bd815
Added get descriptors length function to enable direct access to raw descriptors.
...
Bug: 68936964
Test: manual
Peripherals - Skylab, Mir, HTC dongle, Microsoft LX-3000 (headset), Rosewill (gaming) headset
Peripherals - PreSonus AudioBox 22VSL
Change-Id: Icbfd64c3ac29acab6a4c731d604cb0e620e41dc6
2017-11-06 13:32:52 -07:00
Jin Qian
65d8c03d35
storaged: fix regression found in unit-test
...
Should use reference instead of copy to clear storaged proto
Bug: 63740245
Change-Id: Ibb933a0bac12508467fc104b37e7cc490dfbe948
2017-11-06 19:07:09 +00:00
Miodrag Dinic
cc599273b4
MIPS[64]: codeflinger: Fix build due to unused variable warnings
...
Change-Id: Ie31d44ee74a218c83774df855be496ca862af8c5
Signed-off-by: Miodrag Dinic <miodrag.dinic@mips.com>
2017-11-06 16:38:49 +01:00
Christopher Ferris
13b86658b9
Fix nullptr dereference.
...
If an entry is found in .eh_frame_hdr, but it's not properly in .eh_frame,
then the code would crash. The assumption that the header always points
to valid fde data is not guaranteed.
Bug: 68813077
Test: Passes new unit test that crashed before the change.
Change-Id: I914d9bda0d442cd232e2a056ae490301a8850105
2017-11-05 14:01:43 -08:00
Luis Hector Chavez
fae195b1e4
libcutils: Work around the lack of __mulodi4
...
The parent change ran into an issue where enabling UBSan on an i686
build caused it to use __mulodi4.
https://github.com/android-ndk/ndk/issues/184 documents linking against
libclang_rt.builtins-i686.a, but that's not available from soong either.
Bug: 62378620
Bug: 29412086
Test: x86 builds work again
Change-Id: I730d59558aa4ed28f8a11b5393e037111e320f29
2017-11-04 00:36:01 +00:00
Josh Gao
cdea750576
crash_dump: don't inherit environment from parent.
...
Bug: http://b/68381717
Test: debuggerd_test
Change-Id: Ie1b342bc9901cb9ae9b79147899928a19052cbad
2017-11-03 16:57:56 -07:00
Connor O'Brien
4b7f0fdccb
Merge "fastboot: handle small flash block sizes correctly" am: ebcfa44937
am: 5aff24e01d
...
am: e09baa0f20
Change-Id: I8e7b05e53626c0b78b0e741d4369e6b324074ba1
2017-11-03 21:45:06 +00:00
Connor O'Brien
e09baa0f20
Merge "fastboot: handle small flash block sizes correctly" am: ebcfa44937
...
am: 5aff24e01d
Change-Id: I55f894d3393abf29504237fea973650ae1a0abc0
2017-11-03 21:33:05 +00:00
Connor O'Brien
5aff24e01d
Merge "fastboot: handle small flash block sizes correctly"
...
am: ebcfa44937
Change-Id: I683e1722756d09b09c18d506f9e08e269b6e1921
2017-11-03 21:22:56 +00:00
Connor O'Brien
ebcfa44937
Merge "fastboot: handle small flash block sizes correctly"
2017-11-03 21:15:34 +00:00
Yifan Hong
3cf55ef056
do not getTransport before getting IHealth service.
...
getService already has getTransport logic.
Test: storaged unit tests
Bug: 63702641
Change-Id: I29be15e5713ac276fbbeda88224d8aef514319c6
2017-11-03 13:20:10 -07:00
Luis Hector Chavez
e97a4b9799
libcutils: Make uevent_kernel_* namespace-aware
...
This change adds user namespace-awareness to uevent_kernel_* in
libcutils. Instead of assuming that root is always uid 0, it detects
whether the uid 0 is mapped in the current user namespace and returns
the appropriately mapped uid (or the kernel's "overflowuid" in case it
is not mapped).
In older kernels, or those where user namespaces are not enabled, this
still uses uid 0 for root.
Bug: 62378620
Test: bullhead networking still works
Test: Android in Chrome OS can now receive netlink-related messages
Change-Id: I7ea3454e8f38b9c70c65294d6b2a99e5a88f9d70
2017-11-03 13:02:46 -07:00
Jin Qian
36ebcf8eb6
Merge "fastboot: remove reference of deprecated make_ext4 code" am: 525205508f
am: 2089237ee8
...
am: a241632bcc
Change-Id: I6e489f364bd30d15bc6a56fe9bfcabf9ce143741
2017-11-03 18:59:44 +00:00
Jin Qian
a241632bcc
Merge "fastboot: remove reference of deprecated make_ext4 code" am: 525205508f
...
am: 2089237ee8
Change-Id: Ib6db9a825a0ff0419e93821ac7022cdfbee87edc
2017-11-03 18:05:10 +00:00
Jin Qian
2089237ee8
Merge "fastboot: remove reference of deprecated make_ext4 code"
...
am: 525205508f
Change-Id: I3cb5a79fc9990e6fd613201592f1ae75bf477f4a
2017-11-03 17:41:09 +00:00
Jin Qian
525205508f
Merge "fastboot: remove reference of deprecated make_ext4 code"
2017-11-03 17:28:26 +00:00
Chih-hung Hsieh
f6a36111bc
Merge "Use -Werror in system/core/libpixelflinger" am: e3db2ab732
am: 9aedaa88e8
...
am: 4d8089a86f
Change-Id: I57bb64571474691809972d9b358aa69fc10e6890
2017-11-03 06:11:16 +00:00
Chih-hung Hsieh
4d8089a86f
Merge "Use -Werror in system/core/libpixelflinger" am: e3db2ab732
...
am: 9aedaa88e8
Change-Id: I0cb714e36470e618dcdb867461f64f823bba0ef3
2017-11-03 06:08:39 +00:00