abb3521abe
Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1
...
am: f973417005
2017-10-18 22:56:19 +00:00
f973417005
Merge "Use target.linux for all linux kernel based targets"
...
am: ab62265fa1
2017-10-18 22:50:48 +00:00
ab62265fa1
Merge "Use target.linux for all linux kernel based targets"
2017-10-18 22:46:05 +00:00
1ba5d4ceed
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours am: e994c06f58 -s ours
...
am: b0f25534b1
2017-10-18 22:29:15 +00:00
38ec7354ad
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours
...
am: e994c06f58
2017-10-18 21:54:34 +00:00
b0f25534b1
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours am: 173087ab08 -s ours
...
am: e994c06f58
2017-10-18 21:54:03 +00:00
5d7b55bc69
init: add extra std::move
...
This is meant to be copy-and-move, but I forgot the move.
Test: build
Change-Id: I755ad0d99624dc0ae419ad9ed3ae6d0e017b27c5
2017-10-18 14:52:33 -07:00
fa3e52c64a
init: wait_for_prop shouldn't run in a subcontext
...
wait_for_prop sets a flag that prevents the action queue from
continuing while otherwise allowing init's main loop to continue
executing. This cannot be done from a subcontext, so it's moved to
normal init.
All property functions need work in any case, particularly once
property_service is moved out of init.
Bug: 62875318
Test: boot sailfish and see that the previous failure related to this
is fixed
Change-Id: Ib9e0d0bdbd0ff22ab0e5c3fe6db620700af266c6
2017-10-18 14:42:27 -07:00
e994c06f58
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours am: 3560e92125 -s ours
...
am: 173087ab08
2017-10-18 21:34:11 +00:00
173087ab08
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours am: 78a6b7e28c -s ours
...
am: 3560e92125
2017-10-18 21:03:51 +00:00
3560e92125
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours am: 8ecef89ed0 -s ours
...
am: 78a6b7e28c
2017-10-18 20:41:31 +00:00
78a6b7e28c
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours am: cee1faef67 -s ours
...
am: 8ecef89ed0
2017-10-18 20:27:38 +00:00
8ecef89ed0
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours am: 3c374a2ba7 -s ours
...
am: cee1faef67
2017-10-18 20:08:00 +00:00
cee1faef67
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours am: 069ec60f20 -s ours
...
am: 3c374a2ba7
2017-10-18 19:41:22 +00:00
3c374a2ba7
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours am: fc4b272afe -s ours
...
am: 069ec60f20
2017-10-18 19:28:58 +00:00
069ec60f20
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours am: 47dfd5afee -s ours
...
am: fc4b272afe
2017-10-18 19:23:25 +00:00
df470cd7c5
Merge "Fix setting of map_offset in frame data." am: 8158d708c3 am: 57638bf967
...
am: edf2d46e1c
2017-10-18 19:15:30 +00:00
fc4b272afe
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours am: c282fe5c2c -s ours
...
am: 47dfd5afee
2017-10-18 19:00:44 +00:00
47dfd5afee
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31 am: 3065de2c86 -s ours
...
am: c282fe5c2c
2017-10-18 18:41:28 +00:00
c282fe5c2c
Fix integer overflow in utf{16,32}_to_utf8_length am: c17624db31
...
am: 3065de2c86
2017-10-18 18:31:04 +00:00
edf2d46e1c
Merge "Fix setting of map_offset in frame data." am: 8158d708c3
...
am: 57638bf967
2017-10-18 18:26:17 +00:00
57638bf967
Merge "Fix setting of map_offset in frame data."
...
am: 8158d708c3
2017-10-18 18:07:29 +00:00
8158d708c3
Merge "Fix setting of map_offset in frame data."
2017-10-18 16:01:25 +00:00
c5a3baa5e3
Fix setting of map_offset in frame data.
...
The old code set the map_offset from elf_offset, but it should have used
offset. Without this change, frame data is not properly shown for shared
libraries in an apk.
Add new unit test to verify that map_offset is set properly.
Test: Ran new unit tests.
Change-Id: I2fe5abda23a5de51c8fcf9361ba9350b80446f15
2017-10-17 18:42:03 -07:00
a3524a255f
resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926
...
am: 314ddcd9a3
2017-10-17 21:57:49 +00:00
314ddcd9a3
resolve merge conflicts of 796987482 to stage-aosp-master
...
am: bb5ec4a926
2017-10-17 21:40:12 +00:00
bb5ec4a926
resolve merge conflicts of 796987482 to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ica884c137c5f21e261600b2b011ab963036c0cdb
2017-10-17 12:36:14 -07:00
796987482f
Merge "<stdbool.h> not necessary in C++."
2017-10-17 19:26:53 +00:00
a0f73f9bff
<stdbool.h> not necessary in C++.
...
Bug: N/A
Test: builds
Change-Id: I1f32b202e353414e74ace87a7d5b495b5deb5f99
Merged-In: I1f32b202e353414e74ace87a7d5b495b5deb5f99
2017-10-17 16:21:33 +00:00
486dc4a497
Merge "Only allow UTF8 encoded property values" am: 4ff2607ef7 am: 9c767212eb
...
am: fccffc8645
2017-10-17 16:20:58 +00:00
fccffc8645
Merge "Only allow UTF8 encoded property values" am: 4ff2607ef7
...
am: 9c767212eb
2017-10-17 16:18:55 +00:00
9c767212eb
Merge "Only allow UTF8 encoded property values"
...
am: 4ff2607ef7
2017-10-17 16:17:21 +00:00
4ff2607ef7
Merge "Only allow UTF8 encoded property values"
2017-10-17 16:12:34 +00:00
e930ffcf5f
Add vendor_available to liblog_headers.
...
am: 0567c0e386
2017-10-17 08:12:17 +00:00
0664c9d33b
libutils: liblog export headers
...
am: c956b182e5
2017-10-17 08:11:55 +00:00
0567c0e386
Add vendor_available to liblog_headers.
...
Renamed NDK headers to "liblog_ndk_headers"
(these names aren't used anywhere).
libutils_headers now properly export liblog_headers.
Test: with BOARD_VNDK_VERSION=current
Merged-In: I3a85385f588b84393c57fd6d1bcac620f708f0f1
Change-Id: I3a85385f588b84393c57fd6d1bcac620f708f0f1
(cherry picked from commit 42b485cc53
2017-10-17 08:02:20 +00:00
c956b182e5
libutils: liblog export headers
...
- make liblog dependency for all library builds (this is required
for files like String8.cpp)
- export liblog headers (because they are used in many header files).
Test: less libraries fail with BOARD_VNDK_VERSION := current
Merged-In: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
Change-Id: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
(cherry picked from commit 43e20cac7b
2017-10-17 08:01:48 +00:00
36763aebd4
Add vendor_available to liblog_headers. am: 95d7cbb77a -s ours
...
am: a9f9294831
2017-10-17 05:48:53 +00:00
c0fae5affb
libutils: liblog export headers am: 1f64241e2d -s ours
...
am: dd18cd644b
2017-10-17 05:48:31 +00:00
a9f9294831
Add vendor_available to liblog_headers.
...
am: 95d7cbb77a
2017-10-17 04:03:13 +00:00
dd18cd644b
libutils: liblog export headers
...
am: 1f64241e2d
2017-10-17 04:03:02 +00:00
bdddcab3bd
Use target.linux for all linux kernel based targets
...
Now in Android.bp files, target.linux applies to all targets running a
linux kernel (android, linux_glibc, linux_bionic). So common
flags/sources/etc can be combined instead of copying them to each
target.
Test: m
Change-Id: If7ad138ea1c540c160731f86b6ccc0daa5c69b83
2017-10-16 20:55:39 -07:00
95d7cbb77a
Add vendor_available to liblog_headers.
...
Renamed NDK headers to "liblog_ndk_headers"
(these names aren't used anywhere).
libutils_headers now properly export liblog_headers.
Test: with BOARD_VNDK_VERSION=current
Merged-In: I3a85385f588b84393c57fd6d1bcac620f708f0f1
Change-Id: I3a85385f588b84393c57fd6d1bcac620f708f0f1
(cherry picked from commit 42b485cc53
2017-10-17 12:09:50 +09:00
1f64241e2d
libutils: liblog export headers
...
- make liblog dependency for all library builds (this is required
for files like String8.cpp)
- export liblog headers (because they are used in many header files).
Test: less libraries fail with BOARD_VNDK_VERSION := current
Merged-In: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
Change-Id: Iecb9cd00deb3a9056ea63c4a087afdb80a51a2b8
(cherry picked from commit 43e20cac7b
2017-10-17 12:08:33 +09:00
8702dcb992
Only allow UTF8 encoded property values
...
Java already restricts properties to only UTF8 valid strings, and
this change makes this restriction also apply to all native code.
Bug: 63177684
Test: new unit tests
Change-Id: I9fa0ecc0da066b0a026db3497c0f0cbf3f5c2d5a
2017-10-16 22:35:33 +00:00
b7d92c4b96
libbacktrace is not directly available to vendors
...
This lib becomes VNDK-SP just because libutils, which is VNDK-SP, is
depending on it. Since libutils provide android::CallStack class for
collecting and printing the callstack, there is no need for vendors to
use the internal libbacktrace library. Thus the lib is marked as
vendor_available: false.
Bug: 64730695
Test: build 2017 pixel device
Change-Id: I4ad91e3a6747bb0ae88d32cd26dfba32239c5b93
2017-10-16 11:35:02 +09:00
de74bbe264
Merge "libkeymaster1 split" am: 06254de12a -s ours am: 876c7be912 -s ours
...
am: 6c3bdb8848
2017-10-16 01:41:54 +00:00
6c3bdb8848
Merge "libkeymaster1 split" am: 06254de12a -s ours
...
am: 876c7be912
2017-10-16 01:37:48 +00:00
876c7be912
Merge "libkeymaster1 split"
...
am: 06254de12a
2017-10-16 01:33:07 +00:00
06254de12a
Merge "libkeymaster1 split"
2017-10-16 01:29:29 +00:00
Dan Willemsen