Vishwath Mohan
7baefbc0d4
Merge "Hide CFI behind a global flag." am: 2d7fb30207
...
am: 3ca34aeb7e
2017-01-20 01:50:44 +00:00
Vishwath Mohan
085a015abb
Merge "Hide CFI behind a global flag." am: c0bf85a615
...
am: 1bd8984ace
2017-01-20 01:50:38 +00:00
Vishwath Mohan
3ca34aeb7e
Merge "Hide CFI behind a global flag."
...
am: 2d7fb30207
2017-01-20 01:45:43 +00:00
Vishwath Mohan
1bd8984ace
Merge "Hide CFI behind a global flag."
...
am: c0bf85a615
2017-01-20 01:45:37 +00:00
Vishwath Mohan
2d7fb30207
Merge "Hide CFI behind a global flag."
2017-01-20 01:32:44 +00:00
Vishwath Mohan
c0bf85a615
Merge "Hide CFI behind a global flag."
2017-01-20 01:32:44 +00:00
Dan Willemsen
b7303cde95
Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a
...
am: 4f87826d23
2017-01-20 01:14:05 +00:00
Dan Willemsen
4f87826d23
Merge "Support native test prebuilts for X86+ARM builds"
...
am: bf28f5933a
2017-01-20 01:09:34 +00:00
Treehugger Robot
bf28f5933a
Merge "Support native test prebuilts for X86+ARM builds"
2017-01-20 00:59:42 +00:00
Vishwath Mohan
a5ff3e4133
Hide CFI behind a global flag.
...
This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.
Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
2017-01-19 14:35:31 -08:00
Colin Cross
ac15f41714
Merge "Don't pass empty arguments to ninja" am: f8acdc50fa
...
am: d4aba70550
2017-01-19 06:51:21 +00:00
Colin Cross
d4aba70550
Merge "Don't pass empty arguments to ninja"
...
am: f8acdc50fa
2017-01-19 06:48:21 +00:00
Treehugger Robot
f8acdc50fa
Merge "Don't pass empty arguments to ninja"
2017-01-19 06:43:46 +00:00
Colin Cross
524c868107
Don't pass empty arguments to ninja
...
Passing an empty argument in argv to ninja results in an error:
ninja: error: empty path
Don't add jarg to the argument list if it is empty.
Bug: 34392351
Test: m -j
Change-Id: I39c8998c79b09835650628e1413ae7625cdbc555
2017-01-18 21:12:28 -08:00
Vishwath Mohan
8dcfdcebe9
Hide CFI behind a global flag.
...
This CL ensures that the LOCAL_SANITIZE=cfi is not honored unless it
is enabled globally using ENABLE_CFI='true' first. This allows CFI to
be hidden behind a flag.
Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: If4508ba448bd4260020483f9c11ee849bb419713
2017-01-18 18:04:00 -08:00
Colin Cross
8b8c5d98f1
Merge "Convert -j to a reasonable parallelism for kati" am: bb5c13d359
...
am: 57de869060
2017-01-19 00:14:26 +00:00
Colin Cross
57de869060
Merge "Convert -j to a reasonable parallelism for kati"
...
am: bb5c13d359
2017-01-19 00:12:27 +00:00
Treehugger Robot
bb5c13d359
Merge "Convert -j to a reasonable parallelism for kati"
2017-01-19 00:08:40 +00:00
Josh Gao
1df77bc0c7
Merge "Add crash_dump and tombstoned products." am: 6651199eeb
...
am: 7cf55a4581
2017-01-18 23:42:40 +00:00
Josh Gao
7cf55a4581
Merge "Add crash_dump and tombstoned products."
...
am: 6651199eeb
2017-01-18 23:16:55 +00:00
Josh Gao
6651199eeb
Merge "Add crash_dump and tombstoned products."
2017-01-18 23:04:09 +00:00
Colin Cross
ba55c623cb
Convert -j to a reasonable parallelism for kati
...
When running makeparallel in non-ninja mode, which is used when running
kati with USE_GOMA=true, convert -j to a reasonable parallelism value
the same way ninja does.
Bug: 34392351
Test: make -C build/make/tools/makeparallel makeparallel_test
Change-Id: I9aee4dd2a3b0f2b1c2c10087be83f7b2b06f4368
2017-01-18 14:50:50 -08:00
Nimrod Gileadi
b3aa218921
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
...
am: 11111d875f
2017-01-18 16:53:54 +00:00
Nimrod Gileadi
a5b069e38b
Copy IDC for goldfish_rotary to /system/usr/idc
...
am: 8570bcea52
2017-01-18 16:53:23 +00:00
Jorim Jaggi
4f34f3d6f0
Merge "Revert "SELinux: split property_contexts into platform and non-platform components."" am: ce0bae2f47
...
am: 27b7101c6c
2017-01-18 16:47:50 +00:00
Jorim Jaggi
82968395c1
Revert "SELinux: split property_contexts into platform and non-platform components." am: 8cbd925748
...
am: b909e2c1aa
2017-01-18 16:47:43 +00:00
Nimrod Gileadi
11111d875f
Merge "Copy IDC for goldfish_rotary to /system/usr/idc" into cw-f-dev
2017-01-18 16:44:36 +00:00
Jorim Jaggi
27b7101c6c
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
...
am: ce0bae2f47
2017-01-18 16:42:00 +00:00
Jorim Jaggi
b909e2c1aa
Revert "SELinux: split property_contexts into platform and non-platform components."
...
am: 8cbd925748
2017-01-18 16:41:33 +00:00
Jorim Jaggi
ce0bae2f47
Merge "Revert "SELinux: split property_contexts into platform and non-platform components.""
2017-01-18 16:33:32 +00:00
Jorim Jaggi
8cbd925748
Revert "SELinux: split property_contexts into platform and non-platform components."
...
This reverts commit c5ffdd4bb4
2017-01-18 15:37:30 +00:00
Nimrod Gileadi
8570bcea52
Copy IDC for goldfish_rotary to /system/usr/idc
...
This IDC file won't be used by the emulator, unless there's an input
device called goldfish_rotary. That device is being added to the kernel
in http://r.android.com/321420 .
Once that device is present, EventHub will look for a file named
goldfish_rotary.idc in the system/usr/idc directory to get the device
configuration.
Bug: 33292948
Change-Id: I384f29980d802280e626915844bddc49bc46110d
2017-01-18 11:02:02 +00:00
Sandeep Patil
e3ce754d96
Merge "SELinux: split property_contexts into platform and non-platform components." am: f91d163625
...
am: cb0a92be8b
2017-01-18 06:19:13 +00:00
Sandeep Patil
cb0a92be8b
Merge "SELinux: split property_contexts into platform and non-platform components."
...
am: f91d163625
2017-01-18 06:17:24 +00:00
Sandeep Patil
eec071a34a
SELinux: split property_contexts into platform and non-platform components. am: c5ffdd4bb4
...
am: a94ae916ce
2017-01-18 06:16:59 +00:00
Sandeep Patil
a94ae916ce
SELinux: split property_contexts into platform and non-platform components.
...
am: c5ffdd4bb4
2017-01-18 06:12:26 +00:00
Treehugger Robot
f91d163625
Merge "SELinux: split property_contexts into platform and non-platform components."
2017-01-18 06:09:02 +00:00
Sandeep Patil
fbd4ec4d59
Merge "SELinux: split service_contexts into platform and non-platform components." am: a91d63fa65
...
am: bbf5e0b99b
2017-01-18 00:46:12 +00:00
Sandeep Patil
29c9cb811d
SELinux: split service_contexts into platform and non-platform components. am: e4ade08f63
...
am: 0068df10f6
2017-01-18 00:46:05 +00:00
Sandeep Patil
bbf5e0b99b
Merge "SELinux: split service_contexts into platform and non-platform components."
...
am: a91d63fa65
2017-01-18 00:41:38 +00:00
Sandeep Patil
c5ffdd4bb4
SELinux: split property_contexts into platform and non-platform components.
...
Bug: 33746484
Test: Successfully boot with original service and property contexts.
Successfully boot with split serivce and property contexts.
Change-Id: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com >
2017-01-18 00:41:15 +00:00
Sandeep Patil
0068df10f6
SELinux: split service_contexts into platform and non-platform components.
...
am: e4ade08f63
2017-01-18 00:41:03 +00:00
Treehugger Robot
a91d63fa65
Merge "SELinux: split service_contexts into platform and non-platform components."
2017-01-18 00:36:56 +00:00
Adam Seaton
d672d69641
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559 am: 97c071f5ae am: 61c5e5075c -s ours am: 074c3265aa -s ours am: 2e9eb28b99 am: fef824f53d -s ours am: e5d862ad75 am: 2fff24ead3 am: e85f5851e4 am: 5c2bd9cb75 -s ours am: bf3f53de1f am: 91e97eda54 am: 28332a1767
...
am: b243bee240
2017-01-17 23:40:52 +00:00
Adam Seaton
e69a8f1710
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am: a66bd3ad13 am: 26cd6d4d12 -s ours am: f5ef1d35de -s ours am: 70e501326e am: e13222c98f -s ours am: ed4222f439 am: 1e907b8fe6 am: e61f600b82 am: 1d806358f5 -s ours am: e4f0c9db37 am: 0e5257bcb7 am: 13da0e1089
...
am: 0a4b68bee7
2017-01-17 23:40:43 +00:00
Adam Seaton
b243bee240
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559 am: 97c071f5ae am: 61c5e5075c -s ours am: 074c3265aa -s ours am: 2e9eb28b99 am: fef824f53d -s ours am: e5d862ad75 am: 2fff24ead3 am: e85f5851e4 am: 5c2bd9cb75 -s ours am: bf3f53de1f am: 91e97eda54
...
am: 28332a1767
2017-01-17 23:38:21 +00:00
Adam Seaton
0a4b68bee7
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am: a66bd3ad13 am: 26cd6d4d12 -s ours am: f5ef1d35de -s ours am: 70e501326e am: e13222c98f -s ours am: ed4222f439 am: 1e907b8fe6 am: e61f600b82 am: 1d806358f5 -s ours am: e4f0c9db37 am: 0e5257bcb7
...
am: 13da0e1089
2017-01-17 23:38:14 +00:00
Adam Seaton
28332a1767
[DO NOT MERGE] Updating Security String to 2017-03-05 on klp-dev b/34345751 am: 3597d69559 am: 97c071f5ae am: 61c5e5075c -s ours am: 074c3265aa -s ours am: 2e9eb28b99 am: fef824f53d -s ours am: e5d862ad75 am: 2fff24ead3 am: e85f5851e4 am: 5c2bd9cb75 -s ours am: bf3f53de1f
...
am: 91e97eda54
2017-01-17 23:35:50 +00:00
Adam Seaton
13da0e1089
[DO NOT MERGE] Updating Security String to 2017-03-01 on klp-dev am: 6cece247c4 am: a66bd3ad13 am: 26cd6d4d12 -s ours am: f5ef1d35de -s ours am: 70e501326e am: e13222c98f -s ours am: ed4222f439 am: 1e907b8fe6 am: e61f600b82 am: 1d806358f5 -s ours am: e4f0c9db37
...
am: 0e5257bcb7
2017-01-17 23:35:43 +00:00
Adam Seaton
78052362cf
[DO NOT MERGE] Updating Security String to 2017-03-05 on lmp-dev am: 84888652e0 -s ours am: d438fc526d am: b40dc64ed2 -s ours am: 0a46d4edcf am: 59cd888132 am: f3d5948c42 am: 0a25d51000 -s ours am: 83731b0a4d am: 5467ba8cd1 am: 797e24cf9b
...
am: 85b71b92b5
2017-01-17 23:33:49 +00:00
