James Hawkins
be1f7b3a0c
Merge "bootstat: Add more boot reasons found by logging in the wild."
...
am: a03c935e27
Change-Id: I8f043bf7fa4a659d27395e24c5be63ef9e463b2a
2017-10-19 19:49:08 +00:00
Treehugger Robot
a03c935e27
Merge "bootstat: Add more boot reasons found by logging in the wild."
2017-10-19 19:41:34 +00:00
James Hawkins
34073b583a
bootstat: Add more boot reasons found by logging in the wild.
...
Bug: none
Test: none
Change-Id: I7e388326be44aeb3e6fdb79d2e173dc17eb8bc1f
2017-10-19 10:44:22 -07:00
Tom Cherry
7a23e13edb
Merge "init: add extra std::move"
...
am: d72d92aee2
Change-Id: I928e6f60bd8ffb764ea5f25a81091242efd1f61d
2017-10-19 02:27:32 +00:00
Treehugger Robot
d72d92aee2
Merge "init: add extra std::move"
2017-10-19 02:17:20 +00:00
Josh Gao
39e5bb6129
Merge "bootstat: remove extraneous android_logcat_destroy."
...
am: 6393c62e2e
Change-Id: If31be158f08cc8dcd22b0010ac1a306dc0dcc0ff
2017-10-19 01:56:51 +00:00
Treehugger Robot
6393c62e2e
Merge "bootstat: remove extraneous android_logcat_destroy."
2017-10-19 01:43:22 +00:00
Jiyong Park
0d08313bb8
Merge "libbacktrace is not directly available to vendors"
...
am: 22d2136d75
Change-Id: I18e4c8b414bba731cfe6edaa332de180ff3a9f0b
2017-10-19 01:38:31 +00:00
Treehugger Robot
22d2136d75
Merge "libbacktrace is not directly available to vendors"
2017-10-19 01:31:24 +00:00
Tom Cherry
cadc34fd9a
Merge "init: wait_for_prop shouldn't run in a subcontext"
...
am: 6e52973623
Change-Id: I160bedcb91668ccf2b663c36835871d21be2db8b
2017-10-19 00:14:21 +00:00
Treehugger Robot
6e52973623
Merge "init: wait_for_prop shouldn't run in a subcontext"
2017-10-19 00:10:18 +00:00
Josh Gao
52315ae329
bootstat: remove extraneous android_logcat_destroy.
...
android_logcat_pclose already does that.
Bug: http://b/67960705
Test: mma
Change-Id: I03d06b10807e8a313c9654c2e1db36bfb59e3f99
2017-10-18 16:57:33 -07:00
Dan Willemsen
f973417005
Merge "Use target.linux for all linux kernel based targets"
...
am: ab62265fa1
Change-Id: I11e4bd0dae56c350a9839f95b1e85bf30490701d
2017-10-18 22:50:48 +00:00
Treehugger Robot
ab62265fa1
Merge "Use target.linux for all linux kernel based targets"
2017-10-18 22:46:05 +00:00
Tom Cherry
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
Tom Cherry
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
Christopher Ferris
57638bf967
Merge "Fix setting of map_offset in frame data."
...
am: 8158d708c3
Change-Id: I14c4f2cd4273c5434226ea9765ca74a30bf69630
2017-10-18 18:07:29 +00:00
Christopher Ferris
8158d708c3
Merge "Fix setting of map_offset in frame data."
2017-10-18 16:01:25 +00:00
Christopher Ferris
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
Elliott Hughes
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
Treehugger Robot
796987482f
Merge "<stdbool.h> not necessary in C++."
2017-10-17 19:26:53 +00:00
Elliott Hughes
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
Tom Cherry
9c767212eb
Merge "Only allow UTF8 encoded property values"
...
am: 4ff2607ef7
Change-Id: Ib83ef796bfaaa30dfda36937dfe6be4dac878346
2017-10-17 16:17:21 +00:00
Tom Cherry
4ff2607ef7
Merge "Only allow UTF8 encoded property values"
2017-10-17 16:12:34 +00:00
Dan Willemsen
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
Steven Moreland
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
Steven Moreland
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
Tom Cherry
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
Jiyong Park
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
Jae Shin
876c7be912
Merge "libkeymaster1 split"
...
am: 06254de12a
-s ours
Change-Id: I4dd806771c3052bd1fe48206aebf2066930f994b
2017-10-16 01:33:07 +00:00
Jae Shin
06254de12a
Merge "libkeymaster1 split"
2017-10-16 01:29:29 +00:00
Mark Salyzyn
b684bd4e6a
Merge "bootstat: test: duration fixes"
...
am: 5126ce99de
Change-Id: I7ea58e8c3b292b39ccc3b9814303cd72683c1314
2017-10-15 03:48:28 +00:00
Bowgo Tsai
6353d514e8
Merge "fs_mgr: removing is_device_secure()"
...
am: af54c27e1b
Change-Id: I22cac8bba9115765527b2c484b4ce9c15fe816cc
2017-10-15 02:48:33 +00:00
Janis Danisevskis
5c148f3f26
libkeymaster1 split
...
libkeymaster1 was split into libkeymaster_portable and
libkeymaster_staging.
Bug: 37467707
Test: mma -j
Merged-In: Iead014db3f3d841f08c8072b0493ec9fd7a05055
Merged-In: I63869316451867d54bf34afb28ea232cc7eddbae
Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
2017-10-14 01:18:32 +00:00
Mark Salyzyn
5126ce99de
Merge "bootstat: test: duration fixes"
2017-10-13 16:32:10 +00:00
Mark Salyzyn
244947e813
bootstat: test: duration fixes
...
misspelled duration_test in test_thermal_shutdown
Test: system/core/bootstat/boot_reason_test.sh
Bug: 63736262
Change-Id: I5981fa899db84199aefb46c8741511e6889bc79c
2017-10-13 09:29:53 -07:00
Treehugger Robot
af54c27e1b
Merge "fs_mgr: removing is_device_secure()"
2017-10-13 03:39:21 +00:00
Bowgo Tsai
744361fc57
fs_mgr: removing is_device_secure()
...
Previously there is no vboot 1.0 metadata for ENG builds. It relies on
is_device_secure() to query "ro.secure" and skip setting up dm-verity
if the value is 0 (meaning ENG build).
This change will be submitted together with other changes to add vboot
1.0 metadata for ENG builds with a "disable magic". The resulting
metadata will be the same as triggering an "adb disable-verity" on an
USERDEBUG image.
Bug: 63056044
Test: boot sailfish eng/userdebug builds
Change-Id: I35eef771e1b30bfc6d01b8ed76b40c942fe7b783
2017-10-13 06:34:12 +08:00
Tom Cherry
604f61dcbd
Merge "Move some properties users to __system_property_read_callback()"
...
am: 4a5a337ef2
Change-Id: Ia1553f78fc024d2c43ef9ddb0c191b7fe83a87ff
2017-10-12 17:01:14 +00:00
Tom Cherry
4a5a337ef2
Merge "Move some properties users to __system_property_read_callback()"
2017-10-12 16:53:41 +00:00
Tom Cherry
5d40a3372f
Merge "Allow setting read-only properties with value length > 92 characters"
...
am: 96e8042e41
Change-Id: I538a1e415f4a80df29ba7129af479c061948d36f
2017-10-12 16:19:15 +00:00
Tom Cherry
96e8042e41
Merge "Allow setting read-only properties with value length > 92 characters"
2017-10-12 16:09:43 +00:00
Elliott Hughes
bea330844a
Merge "libsparse: fix building on linux host."
...
am: 716488f53f
Change-Id: Ic4cdc8a08244ecd8ad4c9ced1d758e3f90142fd4
2017-10-12 15:27:32 +00:00
Elliott Hughes
716488f53f
Merge "libsparse: fix building on linux host."
2017-10-12 15:18:40 +00:00
Tom Cherry
1cf8d699a4
Allow setting read-only properties with value length > 92 characters
...
Bug: 23102347
Bug: 34954705
Test: read and write properties with value length > 92 characters
Change-Id: Ie196c1fdacc0489508c633e98fe9f4ad7a27dc6e
2017-10-12 02:52:28 +00:00
Christopher Ferris
008f11fb5e
Merge "Add support for boolean literals."
...
am: 63a0008df7
Change-Id: I050cc47929c0152f05832bbe54a12aa45f93766a
2017-10-12 01:33:49 +00:00
Christopher Ferris
63a0008df7
Merge "Add support for boolean literals."
2017-10-12 01:20:07 +00:00
Dan Albert
d166904f30
Merge "Add missing includes."
...
am: 0c24d6ccea
Change-Id: I4e59965bbc8d9a42b5e7feda56ab289a5c5294b0
2017-10-12 00:16:06 +00:00
Treehugger Robot
0c24d6ccea
Merge "Add missing includes."
2017-10-12 00:06:30 +00:00
Dan Albert
5436974d21
Merge "Add missing includes."
...
am: 81dd96c0da
Change-Id: I6b54545c3eb6322fb5da9f2ef85089fe632cb5f1
2017-10-11 22:30:54 +00:00