OSDN Git Service
Stephen Hines [Thu, 26 Jan 2017 07:29:59 +0000 (07:29 +0000)]
Merge "Don't mark __res_params or android_net_context as packed." am:
0c45c7dc5e am:
6776efa346
am:
fbb7c0e765
Change-Id: I91e731fdaf7edd363556d8f37fa76f5eb7387ea3
Stephen Hines [Thu, 26 Jan 2017 07:24:57 +0000 (07:24 +0000)]
Merge "Don't mark __res_params or android_net_context as packed." am:
0c45c7dc5e
am:
6776efa346
Change-Id: I6b83f36d0e344c9174f7fcdd210ceecbafdd3027
Stephen Hines [Thu, 26 Jan 2017 07:19:19 +0000 (07:19 +0000)]
Merge "Don't mark __res_params or android_net_context as packed."
am:
0c45c7dc5e
Change-Id: I9009bbe594502e890c61c90deee0621662ac1476
Treehugger Robot [Thu, 26 Jan 2017 07:13:16 +0000 (07:13 +0000)]
Merge "Don't mark __res_params or android_net_context as packed."
Paul Lawrence [Wed, 25 Jan 2017 22:55:27 +0000 (22:55 +0000)]
Merge "Use trap not kill in seccomp filter" am:
6418f95ca2 am:
b5a151a12d
am:
fe55c3ac41
Change-Id: I24237753396dc2c62d964a42b4ef9916dc97855d
Paul Lawrence [Wed, 25 Jan 2017 22:52:56 +0000 (22:52 +0000)]
Merge "Use trap not kill in seccomp filter" am:
6418f95ca2
am:
b5a151a12d
Change-Id: Icae95f9dfd6f7b4ab7e5422ee8e1b103e9c62b61
Paul Lawrence [Wed, 25 Jan 2017 22:49:56 +0000 (22:49 +0000)]
Merge "Use trap not kill in seccomp filter"
am:
6418f95ca2
Change-Id: If004fbd71c34916c8e445565416f6419097d3062
Paul Lawrence [Wed, 25 Jan 2017 22:46:05 +0000 (22:46 +0000)]
Merge "Use trap not kill in seccomp filter"
Victor Khimenko [Wed, 25 Jan 2017 10:13:34 +0000 (10:13 +0000)]
Merge "Fix bionic-unit-tests in some non-standard builds" am:
18c009ca96 am:
dc7ec2bb8a
am:
221eef03da
Change-Id: I102cc36b84f00038e3c0d65bf777be6e76bf01ee
Victor Khimenko [Wed, 25 Jan 2017 10:11:35 +0000 (10:11 +0000)]
Merge "Fix bionic-unit-tests in some non-standard builds" am:
18c009ca96
am:
dc7ec2bb8a
Change-Id: Iaee419cd20af017ecd6466f2f303e95afdb1071a
Victor Khimenko [Wed, 25 Jan 2017 10:09:04 +0000 (10:09 +0000)]
Merge "Fix bionic-unit-tests in some non-standard builds"
am:
18c009ca96
Change-Id: Idd15fa0633e4f1449cd86d4405e849f4214e3bc8
Victor Khimenko [Wed, 25 Jan 2017 10:05:40 +0000 (10:05 +0000)]
Merge "Fix bionic-unit-tests in some non-standard builds"
Stephen Hines [Wed, 25 Jan 2017 08:39:47 +0000 (00:39 -0800)]
Don't mark __res_params or android_net_context as packed.
Bug: http://b/
31532493
These internal API structures are never actually used anywhere that
would change behavior because it is "packed", so it is safe to remove.
Test: Builds correctly with the latest toolchain.
Change-Id: I5431992d840777605be75ab91dc21158d6d22c26
Dimitry Ivanov [Wed, 25 Jan 2017 04:04:06 +0000 (04:04 +0000)]
Merge changes from topic 'property_service_protocol_v2' am:
3f6d599775 am:
fc7be4575a
am:
30fdd5d82d
Change-Id: Ica3ecb5bfd390a915e5193fb67cfd198cfb50736
Dimitry Ivanov [Wed, 25 Jan 2017 04:04:01 +0000 (04:04 +0000)]
Do not send 0 byte string content. am:
cafd355375 am:
6fd88344a5
am:
8dba8acd6e
Change-Id: Ida48c2f6dd8a9c65a87c13bff0f67f6b597ba7fa
Dimitry Ivanov [Wed, 25 Jan 2017 04:03:51 +0000 (04:03 +0000)]
Revert "Revert "Remove limit of system property name length"" am:
16b2a4de14 am:
d91e7766ec
am:
c809b7a43f
Change-Id: Ic91631717fae0dea66ae970a99e67e178ffedd4f
Dimitry Ivanov [Wed, 25 Jan 2017 03:58:55 +0000 (03:58 +0000)]
Merge changes from topic 'property_service_protocol_v2' am:
3f6d599775
am:
fc7be4575a
Change-Id: Idef9ac8ffbc458064121c43031de1a07a4300f90
Dimitry Ivanov [Wed, 25 Jan 2017 03:58:50 +0000 (03:58 +0000)]
Do not send 0 byte string content. am:
cafd355375
am:
6fd88344a5
Change-Id: If8fd7fac36d145cf6f611cc562ab5b5b345e33d9
Dimitry Ivanov [Wed, 25 Jan 2017 03:58:46 +0000 (03:58 +0000)]
Revert "Revert "Remove limit of system property name length"" am:
16b2a4de14
am:
d91e7766ec
Change-Id: I19be17e5aec71182a9b83e3720e3fc3dd0cf5d0e
Dimitry Ivanov [Wed, 25 Jan 2017 03:56:59 +0000 (03:56 +0000)]
Merge changes from topic 'property_service_protocol_v2'
am:
3f6d599775
Change-Id: Ia0a7f1371743a345dbfbfe6d224caadd74dd6187
Dimitry Ivanov [Wed, 25 Jan 2017 03:56:47 +0000 (03:56 +0000)]
Do not send 0 byte string content.
am:
cafd355375
Change-Id: I8c2cc596f4f5d6e9ecc0de6130be8bdfcb19c1ec
Dimitry Ivanov [Wed, 25 Jan 2017 03:56:42 +0000 (03:56 +0000)]
Revert "Revert "Remove limit of system property name length""
am:
16b2a4de14
Change-Id: I585a55769cdca1d7f9edee479b5ec94d8821b673
Dimitry Ivanov [Wed, 25 Jan 2017 03:53:56 +0000 (03:53 +0000)]
Merge changes from topic 'property_service_protocol_v2'
* changes:
Do not send 0 byte string content.
Revert "Revert "Remove limit of system property name length""
Dimitry Ivanov [Tue, 24 Jan 2017 20:39:33 +0000 (12:39 -0800)]
Do not send 0 byte string content.
Trying to send even 0 bytes to closed socket leads to
broken pipe error. Sometimes property service is just
quick enough and closes the socket between send(valuelen)
and send(value) in the case where valuelen is 0.
Bug: http://b/
34670529
Test: adb reboot 20 times and make sure phone service did not fail
Test: run bionic-unit-tests --gtest_filter=prop*
Change-Id: I96f90ca6fe1790614e7efd3015bffed1ef1e9040
Victor Khimenko [Tue, 24 Jan 2017 21:12:07 +0000 (22:12 +0100)]
Fix bionic-unit-tests in some non-standard builds
The binary bionic-unit-tests is linked with some shared libraries
and these libraries are found in ${ORIGIN}/../bionic-loader-test-libs
directory specified by runpath. This makes it higly unlikely that
anyone would be run these files when ${ORIGIN}/../bionic-loader-test-libs
does not include proper files.
Bug: http://b/
34681268
Test: run bionic-unit-tests --gtest_filter=dl*:Dl*
Change-Id: I52fc31339fdfa232c0fdafa218eadaeaf5551a8d
Evgenii Stepanov [Tue, 24 Jan 2017 21:06:11 +0000 (21:06 +0000)]
Merge "[cfi] Handle large libraries correctly." am:
d8388cd303 am:
7eb9bb3099
am:
099f2364df
Change-Id: Id7266f54ec997b9c65b207f0b91aab21c8f5c384
Evgenii Stepanov [Tue, 24 Jan 2017 21:04:11 +0000 (21:04 +0000)]
Merge "[cfi] Handle large libraries correctly." am:
d8388cd303
am:
7eb9bb3099
Change-Id: I4d5fe54ae8f26fdfc2a0baf6b391575a8be82c5a
Evgenii Stepanov [Tue, 24 Jan 2017 21:02:40 +0000 (21:02 +0000)]
Merge "[cfi] Handle large libraries correctly."
am:
d8388cd303
Change-Id: I3032727f90e26837b69b558551ccd420ae7bc680
Dimitry Ivanov [Tue, 24 Jan 2017 20:43:29 +0000 (20:43 +0000)]
Revert "Revert "Remove limit of system property name length""
This reverts commit
489f58b5eaedd5a80635bb3a7b39e97037c585f6.
Bug: http://b/
33926793
Bug: http://b/
34670529
Test: Run bionic-unit-tests --gtest_filter=prop*
Change-Id: Id4e94652dc2310a21f5b7bd3af098bf79df3f380
Evgenii Stepanov [Tue, 24 Jan 2017 20:56:28 +0000 (20:56 +0000)]
Merge "[cfi] Handle large libraries correctly."
Dimitry Ivanov [Tue, 24 Jan 2017 20:09:08 +0000 (20:09 +0000)]
Merge "Revert "Remove limit of system property name length"" am:
40250bb683 am:
e3a684f858
am:
205bb70df8
Change-Id: Ic33f6f20210fb37dde324b79a92bcd06caad9514
Dimitry Ivanov [Tue, 24 Jan 2017 20:07:38 +0000 (20:07 +0000)]
Merge "Revert "Remove limit of system property name length"" am:
40250bb683
am:
e3a684f858
Change-Id: Idbd449ff4c4990695a09badc53faab34470f3737
Dimitry Ivanov [Tue, 24 Jan 2017 20:05:38 +0000 (20:05 +0000)]
Merge "Revert "Remove limit of system property name length""
am:
40250bb683
Change-Id: Ic2565a4ad5d42146378364c06250260ca466cc98
Dimitry Ivanov [Tue, 24 Jan 2017 20:00:43 +0000 (20:00 +0000)]
Merge "Revert "Remove limit of system property name length""
Paul Lawrence [Tue, 24 Jan 2017 18:44:55 +0000 (10:44 -0800)]
Use trap not kill in seccomp filter
Bug:
34647665
Test: Make sure boots, check that causing a seccomp failure creates a
crash dump
Change-Id: I5ab2fe3e8322a3c38318c97d343834baa874af8d
Dimitry Ivanov [Tue, 24 Jan 2017 18:39:04 +0000 (18:39 +0000)]
Revert "Remove limit of system property name length"
This reverts commit
5c1ce278f31bc6fc338b9b951f1adc7c2b343d7c.
Bug: http://b/
33926793
Bug: http://b/
34670529
Change-Id: I0dc4a8ae55576c69b34b2958d8e664f7066b9c54
Vijay Venkatraman [Tue, 24 Jan 2017 17:44:51 +0000 (17:44 +0000)]
Merge "Removed include log\logger.h from log_fake.cpp" am:
f0b42ae973 am:
6529a136e7
am:
ae161415fe
Change-Id: Ia8d52e713e24057843b03be1da4f2623e2873749
Vijay Venkatraman [Tue, 24 Jan 2017 17:42:50 +0000 (17:42 +0000)]
Merge "Removed include log\logger.h from log_fake.cpp" am:
f0b42ae973
am:
6529a136e7
Change-Id: I83bef9a2dca60c16ae8e850db01f4431099ab985
Vijay Venkatraman [Tue, 24 Jan 2017 17:40:50 +0000 (17:40 +0000)]
Merge "Removed include log\logger.h from log_fake.cpp"
am:
f0b42ae973
Change-Id: Iba9012e9206234e104c355443803d278a861b336
Vijay Venkatraman [Tue, 24 Jan 2017 17:36:08 +0000 (17:36 +0000)]
Merge "Removed include log\logger.h from log_fake.cpp"
Dimitry Ivanov [Tue, 24 Jan 2017 03:00:22 +0000 (03:00 +0000)]
Merge "Remove limit of system property name length" am:
440d6c7644 am:
87190c845e
am:
eda500fdf9
Change-Id: I15823d5f19f592465f17441429635d5085080060
Dimitry Ivanov [Tue, 24 Jan 2017 02:58:21 +0000 (02:58 +0000)]
Merge "Remove limit of system property name length" am:
440d6c7644
am:
87190c845e
Change-Id: I3ba27bdf237f750195ce4829bd5c6181f174000c
Vijay Venkatraman [Tue, 24 Jan 2017 02:56:53 +0000 (18:56 -0800)]
Removed include log\logger.h from log_fake.cpp
Test: Compile malloc_debug_unit_tests
Change-Id: I635687016570ba52c571435b87d8e89f7f04d609
Dimitry Ivanov [Tue, 24 Jan 2017 02:56:24 +0000 (02:56 +0000)]
Merge "Remove limit of system property name length"
am:
440d6c7644
Change-Id: I3ff9fb98065166cb53dfe153448e059df9ca6a71
Dimitry Ivanov [Tue, 24 Jan 2017 02:54:33 +0000 (02:54 +0000)]
Merge "Remove limit of system property name length"
Dimitry Ivanov [Tue, 24 Jan 2017 00:46:43 +0000 (00:46 +0000)]
Merge "Remove libc++ dependency from prebuilt test-libs" am:
8bb01c0719 am:
865ceb0c1b
am:
633c9f6999
Change-Id: I8d3839e322dedfc36d57e1e25f4dd84dfb0db258
Dimitry Ivanov [Tue, 24 Jan 2017 00:46:33 +0000 (00:46 +0000)]
Merge "Mark ifunc tests failing on arm as known failures" am:
3685e4515f am:
c3f26cb41e
am:
0fd876c9c9
Change-Id: Ibc3cb3952258a4f75968cd41fb98773a395d2fa1
Dimitry Ivanov [Tue, 24 Jan 2017 00:44:03 +0000 (00:44 +0000)]
Merge "Remove libc++ dependency from prebuilt test-libs" am:
8bb01c0719
am:
865ceb0c1b
Change-Id: If2705b362d4fd2fede3fc7d2f416038da18a2501
Dimitry Ivanov [Tue, 24 Jan 2017 00:42:31 +0000 (00:42 +0000)]
Merge "Remove libc++ dependency from prebuilt test-libs"
am:
8bb01c0719
Change-Id: I2d28e3f2be50a9726e4712bf7f731c1ecd215e47
Treehugger Robot [Tue, 24 Jan 2017 00:35:59 +0000 (00:35 +0000)]
Merge "Remove libc++ dependency from prebuilt test-libs"
Dimitry Ivanov [Tue, 24 Jan 2017 00:29:01 +0000 (00:29 +0000)]
Merge "Mark ifunc tests failing on arm as known failures" am:
3685e4515f
am:
c3f26cb41e
Change-Id: I044b68ab0fa4f22e9263e49d48c390f7ac440fed
Dimitry Ivanov [Tue, 24 Jan 2017 00:27:32 +0000 (00:27 +0000)]
Merge "Mark ifunc tests failing on arm as known failures"
am:
3685e4515f
Change-Id: I1bf5509ecb820df66e28aff3b80b8c1cdb857b53
Treehugger Robot [Tue, 24 Jan 2017 00:24:40 +0000 (00:24 +0000)]
Merge "Mark ifunc tests failing on arm as known failures"
Dimitry Ivanov [Mon, 23 Jan 2017 22:48:21 +0000 (14:48 -0800)]
Mark ifunc tests failing on arm as known failures
Bug: http://b/
27930475
Test: run bionic-unit-tests on arm and arm64
Change-Id: I5084b6a5ef4b56ca9985da63a5e6896f771810f0
Dimitry Ivanov [Fri, 20 Jan 2017 23:47:03 +0000 (15:47 -0800)]
Remove libc++ dependency from prebuilt test-libs
Bug: http://b/
27549327
Test: run bionic-unit-tests --gtest_filter=dl*:Dl* on angler
Change-Id: Ia09ed2c00213bc07bf2a4c772e675419f7a30cb3
Dimitry Ivanov [Thu, 3 Dec 2015 19:26:38 +0000 (11:26 -0800)]
Remove limit of system property name length
This change introduces new __system_property_read_callback
method to use in place of deprecated __system_property_read
__system_property_set() and get() should just work but now
do not have limit on system property names.
Bug: http://b/
33926793
Test: boot device, run adb shell propget
Test: boot device with old version of init (protocol v1)
Test: run bionic-unit-tests --gtest_filter=prop*
Change-Id: I619fb5a7e27a272aac30011579665f6160888bc7
Evgenii Stepanov [Fri, 20 Jan 2017 21:47:04 +0000 (13:47 -0800)]
[cfi] Handle large libraries correctly.
Fallback to unchecked if the shadow offset overflows int16_t.
This may happen when a library's data segment is larger than 256MB.
Also updated some comments.
Bug:
22033465
Test: bionic device tests
Change-Id: I8eef42f75099f24aed566499ff1731a0bbf01ff3
Jaekyun Seok [Fri, 20 Jan 2017 04:17:45 +0000 (04:17 +0000)]
Merge "Add props files for each partition" am:
7844b4c5db am:
291192fb15
am:
d18aed7e8e
Change-Id: I7e0da27b091e07a87e0999a1058b8de4ad147aad
Jaekyun Seok [Fri, 20 Jan 2017 04:05:47 +0000 (04:05 +0000)]
Merge "Add props files for each partition" am:
7844b4c5db
am:
291192fb15
Change-Id: I6dd5a0cc06c8e5f7c5d8cb1177e24aba114bd8f2
Jaekyun Seok [Fri, 20 Jan 2017 04:02:14 +0000 (04:02 +0000)]
Merge "Add props files for each partition"
am:
7844b4c5db
Change-Id: I25c7789f689e3aadcca99e5fd8a6908db9bc57d2
Treehugger Robot [Fri, 20 Jan 2017 03:58:51 +0000 (03:58 +0000)]
Merge "Add props files for each partition"
Jaekyun Seok [Tue, 17 Jan 2017 05:44:31 +0000 (14:44 +0900)]
Add props files for each partition
The following files will be added.
- /vendor/default.prop for default prop overrides from vendor
partition.
- /odm/default.prop for default prop overrides from odm partition.
- /odm/build.prop for build prop overrides from odm partition.
Test: tested default/build prop files with enabling early mount, but
didn't test files of odm partition because odm partition doesn't
exist now.
Bug:
34116668
Change-Id: Ia99895a0afcdc522463d95b2f3e2841dcf2e3516
Paul Lawrence [Thu, 19 Jan 2017 23:36:31 +0000 (23:36 +0000)]
Merge "Add seccomp support library" am:
ad3b3995e7 am:
9ef18d5752
am:
b46ed1098d
Change-Id: Id645fe1b6d051b740d74b1147813cc8c842b8419
Paul Lawrence [Thu, 19 Jan 2017 23:32:59 +0000 (23:32 +0000)]
Merge "Add seccomp support library" am:
ad3b3995e7
am:
9ef18d5752
Change-Id: I07efd9bf2dc2e9c040a51265d5be6d6e8ad5c779
Paul Lawrence [Thu, 19 Jan 2017 23:30:28 +0000 (23:30 +0000)]
Merge "Add seccomp support library"
am:
ad3b3995e7
Change-Id: I1115c8c39de622d594447a56d2cd0893991effac
Treehugger Robot [Thu, 19 Jan 2017 23:26:09 +0000 (23:26 +0000)]
Merge "Add seccomp support library"
Paul Lawrence [Fri, 11 Nov 2016 19:33:42 +0000 (11:33 -0800)]
Add seccomp support library
Policy library which exports an autogenerated policy from SYSCALLS.TXT
blocking any other calls.
Test: Generate policy, install onto Sailfish, check boots, Chrome runs,
calls are blocked.
Bug:
32313202
Change-Id: Ib590704e50122f077eeae26561eb9b0a70386551
Evgenii Stepanov [Thu, 19 Jan 2017 00:02:15 +0000 (00:02 +0000)]
Merge "Runtime support for CFI" am:
082bec5b41 am:
adcec1585b
am:
992d012f80
Change-Id: I104ec5d0a128ddfba0033b3df882c7efcb158f2e
Josh Gao [Thu, 19 Jan 2017 00:02:05 +0000 (00:02 +0000)]
Merge changes from topic 'kill_debuggerd' am:
2d261e8e9e am:
05ad7e11be
am:
5204073dfa
Change-Id: I73760581a548d5f3e8920b7c109f56734dce7054
Josh Gao [Wed, 18 Jan 2017 23:55:14 +0000 (23:55 +0000)]
Rename libdebuggerd_client to libdebuggerd_handler. am:
2a3b4fa6ec am:
3560ff90f0
am:
4a5699ab52
Change-Id: I72a704e119361d579bd2fa774b74a9d5c78413b0
Josh Gao [Wed, 18 Jan 2017 23:55:09 +0000 (23:55 +0000)]
Reserve a realtime signal for debuggerd. am:
f8a6d4745d am:
3d8c6aa3a1
am:
2562ae8215
Change-Id: Ic03d57d7f66bacf8daf8dc58b83652c76022bb99
Evgenii Stepanov [Wed, 18 Jan 2017 23:54:34 +0000 (23:54 +0000)]
Merge "Runtime support for CFI" am:
082bec5b41
am:
adcec1585b
Change-Id: I4eafd03da458f1672991fe14dfa71667ae2bc686
Josh Gao [Wed, 18 Jan 2017 23:54:24 +0000 (23:54 +0000)]
Merge changes from topic 'kill_debuggerd' am:
2d261e8e9e
am:
05ad7e11be
Change-Id: If272e532157203faf8750454c94eb0058c2a145d
Evgenii Stepanov [Wed, 18 Jan 2017 23:45:54 +0000 (23:45 +0000)]
Merge "Runtime support for CFI"
am:
082bec5b41
Change-Id: I47ea89f7161ff7c00a89a291ba7386c2b6f5c191
Josh Gao [Wed, 18 Jan 2017 23:42:31 +0000 (23:42 +0000)]
Rename libdebuggerd_client to libdebuggerd_handler. am:
2a3b4fa6ec
am:
3560ff90f0
Change-Id: I454eceb8b3507581bda6901349940fc201467d02
Josh Gao [Wed, 18 Jan 2017 23:42:24 +0000 (23:42 +0000)]
Reserve a realtime signal for debuggerd. am:
f8a6d4745d
am:
3d8c6aa3a1
Change-Id: I24d59d8b77a8df6658637ae44afc2af5bc109f5c
Evgenii Stepanov [Wed, 18 Jan 2017 23:39:07 +0000 (23:39 +0000)]
Merge "Runtime support for CFI"
Josh Gao [Wed, 18 Jan 2017 23:25:03 +0000 (23:25 +0000)]
Merge changes from topic 'kill_debuggerd'
am:
2d261e8e9e
Change-Id: Ibec7e7093bbe580cc126225c2f2d1f280de51a43
Josh Gao [Wed, 18 Jan 2017 23:16:47 +0000 (23:16 +0000)]
Rename libdebuggerd_client to libdebuggerd_handler.
am:
2a3b4fa6ec
Change-Id: Iac8466c0995571ce51a81f903903115442f5bc17
Josh Gao [Wed, 18 Jan 2017 23:16:39 +0000 (23:16 +0000)]
Reserve a realtime signal for debuggerd.
am:
f8a6d4745d
Change-Id: If7eced969434e50beec04625c905ef374cdcdfb1
Josh Gao [Wed, 18 Jan 2017 23:04:08 +0000 (23:04 +0000)]
Merge changes from topic 'kill_debuggerd'
* changes:
Rename libdebuggerd_client to libdebuggerd_handler.
Reserve a realtime signal for debuggerd.
Evgenii Stepanov [Wed, 6 Jul 2016 20:20:59 +0000 (13:20 -0700)]
Runtime support for CFI
Control Flow Integrity support in bionic.
General design:
http://clang.llvm.org/docs/ControlFlowIntegrityDesign.html#shared-library-support
This CL implements subsections "CFI Shadow" and "CFI_SlowPath" in the above document.
Bug:
22033465
Test: bionic device tests
Change-Id: I14dfea630de468eb5620e7f55f92b1397ba06217
Colin Cross [Wed, 18 Jan 2017 18:21:59 +0000 (18:21 +0000)]
Merge "Declare dependency on android_filesystem_config.h" am:
2f238b32cd am:
5b91973fb7
am:
19b40c7e14
Change-Id: If5ef695f2f34ae5401e4d84760602f417231edc8
Jorim Jaggi [Wed, 18 Jan 2017 18:21:46 +0000 (18:21 +0000)]
Merge "Revert "property_contexts: split into platform and non-platform components"" am:
dbfa1bd292 am:
e6a17b4baf
am:
07e74ea198
Change-Id: Ib9a5a94c95f24cbf36aa25ad297b48f3643a8fbe
Jorim Jaggi [Wed, 18 Jan 2017 18:18:50 +0000 (18:18 +0000)]
Revert "property_contexts: split into platform and non-platform components" am:
e2f5ea14c5 am:
860a1db8fd
am:
abea8788e8
Change-Id: I023ee1f9c879287b7e40d9af2f0c7a948bd8c251
Colin Cross [Wed, 18 Jan 2017 17:06:18 +0000 (17:06 +0000)]
Merge "Declare dependency on android_filesystem_config.h" am:
2f238b32cd
am:
5b91973fb7
Change-Id: I4ede35c4deab0b6cbe59a958633ac89b4cee0204
Colin Cross [Wed, 18 Jan 2017 16:59:52 +0000 (16:59 +0000)]
Merge "Declare dependency on android_filesystem_config.h"
am:
2f238b32cd
Change-Id: Ia69ebf6c7d1aeefc61ff301197d3d994a009b477
Colin Cross [Wed, 18 Jan 2017 16:53:25 +0000 (16:53 +0000)]
Merge "Declare dependency on android_filesystem_config.h"
Jorim Jaggi [Wed, 18 Jan 2017 16:53:16 +0000 (16:53 +0000)]
Merge "Revert "property_contexts: split into platform and non-platform components"" am:
dbfa1bd292
am:
e6a17b4baf
Change-Id: I3124b8b82cf42f116322082d53462863a97cca09
Jorim Jaggi [Wed, 18 Jan 2017 16:47:36 +0000 (16:47 +0000)]
Revert "property_contexts: split into platform and non-platform components" am:
e2f5ea14c5
am:
860a1db8fd
Change-Id: I98f7277d7f8e4f3eb6474ec62f82a80fbf63f1b4
Jorim Jaggi [Wed, 18 Jan 2017 16:47:31 +0000 (16:47 +0000)]
Merge "Revert "property_contexts: split into platform and non-platform components""
am:
dbfa1bd292
Change-Id: I7279216d6987fa853ee759997e2c571fc01ce5ed
Jorim Jaggi [Wed, 18 Jan 2017 16:41:36 +0000 (16:41 +0000)]
Revert "property_contexts: split into platform and non-platform components"
am:
e2f5ea14c5
Change-Id: I9a794b93b077791ce46016cb9f8965a52c98b88e
Jorim Jaggi [Wed, 18 Jan 2017 16:33:31 +0000 (16:33 +0000)]
Merge "Revert "property_contexts: split into platform and non-platform components""
Jorim Jaggi [Wed, 18 Jan 2017 15:37:18 +0000 (15:37 +0000)]
Revert "property_contexts: split into platform and non-platform components"
This reverts commit
8213615461f7d39620e44f73980acc6107c76ac7.
Change-Id: Id2982eafadc5d1c307b60c1f8abe78df8dc8b82e
Sandeep Patil [Wed, 18 Jan 2017 06:26:39 +0000 (06:26 +0000)]
Merge "property_contexts: split into platform and non-platform components" am:
0b6d0a8b38 am:
dbfa403a75
am:
dc67d13c97
Change-Id: I539bbb47e69ca8d1f8f550b4090a1a3c5bcebe81
Sandeep Patil [Wed, 18 Jan 2017 06:21:53 +0000 (06:21 +0000)]
property_contexts: split into platform and non-platform components am:
8213615461 am:
045ba4b249
am:
84ac3e4354
Change-Id: I8c7543563a3ce1f0d9fed028e504b72fd197a3c6
Sandeep Patil [Wed, 18 Jan 2017 06:21:38 +0000 (06:21 +0000)]
Merge "property_contexts: split into platform and non-platform components" am:
0b6d0a8b38
am:
dbfa403a75
Change-Id: I66db487ba16d0fcad7a5c67385c69de05419e07f
Sandeep Patil [Wed, 18 Jan 2017 06:16:51 +0000 (06:16 +0000)]
property_contexts: split into platform and non-platform components am:
8213615461
am:
045ba4b249
Change-Id: Ie92f9de186e3ff723e67ee17f4d6224569dee65f
Sandeep Patil [Wed, 18 Jan 2017 06:16:50 +0000 (06:16 +0000)]
Merge "property_contexts: split into platform and non-platform components"
am:
0b6d0a8b38
Change-Id: I10c9caa9f85f21e681b8ab02cd3ea5e8ef489eb0
Sandeep Patil [Wed, 18 Jan 2017 06:12:19 +0000 (06:12 +0000)]
property_contexts: split into platform and non-platform components
am:
8213615461
Change-Id: Ifa1bb1e295cef8ecf74a4a4702114a88f3e6859e
OSDN Git Service
