Adam Seaton
773e5235e6
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9 am: 6e52769b01
...
am: 53980e19aa
2017-04-13 22:43:09 +00:00
Adam Seaton
a0e65c2249
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb
...
am: d8dbdc0809
2017-04-13 22:42:57 +00:00
Justin Klaassen
2bfe0943c8
Add "android.software.preview_sdk" feature
...
Conditionally add the "android.software.preview_sdk" feature to any
targets that have a Build.VERSION.CODENAME != "REL". This allows clients
to filter out platforms that are not running official Android releases.
Bug: 31064561
Test: verified using PackageManager#getSystemAvailableFeatures()
Change-Id: I539e9537f5f9a572db0a15489b14710e2e8eb0c0
2017-04-13 20:57:50 +00:00
Martijn Coenen
96d62d7fb7
Add NfcNci to default builds.
...
The package won't be started if the feature is not
present on the device, but we need it for generic
builds.
Bug: 36873979
Test: marlin builds
Change-Id: Ib8110e5af00f8365f45f50b147fe5fb42f1a14e1
2017-04-13 11:13:46 -07:00
Michael Schwartz
4d9cb56866
Rule to copy device manifest to device
...
The device manifest defines the collection of HAL interfaces exposed by
the vendor. Create a common rule so each target need not define their own.
Bug: 36810913
Test: Ran marlin build and inspected file was copied
Change-Id: I9f53796fdd85e706f91664d275aff6dbd785213f
2017-04-13 08:42:42 -07:00
Martijn Coenen
14d363fa42
Merge "Add hwservice_contexts to default builds." into oc-dev
2017-04-13 03:34:49 +00:00
Jiyong Park
93cae68532
Change ld.config.txt to a module
...
ld.config.txt is changed to a module. So, installing it via
PRODUCT_PACKAGES intead of PRODUCT_COPY_FILES.
Bug: 37138083
Test: sailfish boots
Change-Id: I8689b7c090901d4f157c5da8a67326c97373ed29
2017-04-13 11:29:24 +09:00
TreeHugger Robot
86d479d33e
Merge "Remove resource overlay" into oc-dev
2017-04-13 01:37:22 +00:00
Adam Seaton
a34ba7f284
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50
...
am: d236029c61
2017-04-12 23:29:53 +00:00
Adam Seaton
53980e19aa
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef am: 5e089f6be9
...
am: 6e52769b01
2017-04-12 23:29:47 +00:00
Adam Seaton
d236029c61
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f
...
am: f84d2ddb50
2017-04-12 23:24:22 +00:00
Adam Seaton
6e52769b01
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours am: b57f591fef
...
am: 5e089f6be9
2017-04-12 23:24:17 +00:00
Adam Seaton
85b7e86b2e
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d -s ours am: af6f3d396b -s ours am: f9391ddc42 -s ours am: a2bd03bf69 -s ours
...
am: 1ba1dfe6c5
2017-04-12 23:19:21 +00:00
Adam Seaton
6d66c2b356
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad -s ours am: 9a0ddb1332 -s ours am: f96d8a15d8 -s ours am: b81762de8d -s ours
...
am: 02f41e01cb
2017-04-12 23:19:13 +00:00
Adam Seaton
5c1507f60a
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 -s ours am: 557f15a715 -s ours am: 6e77a62f7e -s ours am: f3d9b0323d -s ours
...
am: 08efc0cd6b
2017-04-12 23:18:52 +00:00
Adam Seaton
f84d2ddb50
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9
...
am: f73b5cbd1f
2017-04-12 23:18:51 +00:00
Adam Seaton
5e089f6be9
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7 am: 13b453c917 -s ours
...
am: b57f591fef
2017-04-12 23:18:46 +00:00
Adam Seaton
3380ff6737
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 -s ours am: 5958603884 -s ours am: 752ed1efb9 -s ours am: 63750aafe0 -s ours
...
am: 8dd56abe81
2017-04-12 23:18:46 +00:00
Adam Seaton
f73b5cbd1f
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1
...
am: 724c3d4bd9
2017-04-12 23:13:21 +00:00
Adam Seaton
1ba1dfe6c5
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d -s ours am: af6f3d396b -s ours am: f9391ddc42 -s ours
...
am: a2bd03bf69
2017-04-12 23:13:20 +00:00
Adam Seaton
d8dbdc0809
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86
...
am: cf896d4bcb
2017-04-12 23:13:16 +00:00
Adam Seaton
b57f591fef
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours am: ff3f6e29e7
...
am: 13b453c917
2017-04-12 23:13:16 +00:00
Adam Seaton
02f41e01cb
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad -s ours am: 9a0ddb1332 -s ours am: f96d8a15d8 -s ours
...
am: b81762de8d
2017-04-12 23:13:11 +00:00
Adam Seaton
08efc0cd6b
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 -s ours am: 557f15a715 -s ours am: 6e77a62f7e -s ours
...
am: f3d9b0323d
2017-04-12 23:12:52 +00:00
Adam Seaton
8dd56abe81
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 -s ours am: 5958603884 -s ours am: 752ed1efb9 -s ours
...
am: 63750aafe0
2017-04-12 23:12:45 +00:00
Adam Seaton
5051b385e3
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d am: 358777c4fe
...
am: 752ff90839
2017-04-12 23:08:18 +00:00
Adam Seaton
a2bd03bf69
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d -s ours am: af6f3d396b -s ours
...
am: f9391ddc42
2017-04-12 23:08:17 +00:00
Adam Seaton
2ac4273a7f
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad am: b1e5092b3f
...
am: 19ef36f8ad
2017-04-12 23:08:12 +00:00
Adam Seaton
b81762de8d
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad -s ours am: 9a0ddb1332 -s ours
...
am: f96d8a15d8
2017-04-12 23:08:11 +00:00
Adam Seaton
f3d9b0323d
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 -s ours am: 557f15a715 -s ours
...
am: 6e77a62f7e
2017-04-12 23:07:50 +00:00
Adam Seaton
85ab2c9c56
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 am: 0e503efe43
...
am: 019c695262
2017-04-12 23:07:50 +00:00
Adam Seaton
724c3d4bd9
Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01
...
am: 12e0186aa1
2017-04-12 23:07:49 +00:00
Adam Seaton
cf896d4bcb
Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
...
am: 2596931e86
2017-04-12 23:07:46 +00:00
Adam Seaton
13b453c917
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev am: 91a21e9d12 -s ours
...
am: ff3f6e29e7
2017-04-12 23:07:45 +00:00
Adam Seaton
63750aafe0
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 -s ours am: 5958603884 -s ours
...
am: 752ed1efb9
2017-04-12 23:07:45 +00:00
Adam Seaton
60660d0a17
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 am: 888cf4cf67
...
am: 17a45d4c94
2017-04-12 23:07:45 +00:00
Adam Seaton
f9391ddc42
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d -s ours
...
am: af6f3d396b
2017-04-12 23:03:44 +00:00
Adam Seaton
f96d8a15d8
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad -s ours
...
am: 9a0ddb1332
2017-04-12 23:03:37 +00:00
Adam Seaton
6e77a62f7e
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0 -s ours
...
am: 557f15a715
2017-04-12 23:03:19 +00:00
Adam Seaton
752ff90839
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39 am: c37c1a540d
...
am: 358777c4fe
2017-04-12 23:03:17 +00:00
Adam Seaton
2596931e86
Merge changes I5c252cba,I80259eef into mnc-dev
...
am: ea6878b926
2017-04-12 23:03:15 +00:00
Adam Seaton
752ed1efb9
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986 -s ours
...
am: 5958603884
2017-04-12 23:03:14 +00:00
Adam Seaton
19ef36f8ad
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14 am: 859eeaa4ad
...
am: b1e5092b3f
2017-04-12 23:03:09 +00:00
Adam Seaton
019c695262
[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f am: 15420e5bb0 am: 49ca7ee1b0
...
am: 0e503efe43
2017-04-12 23:02:50 +00:00
Adam Seaton
12e0186aa1
Merge changes Iee17fa80,Id9ee50be into lmp-dev
...
am: 9e63540d01
2017-04-12 23:02:45 +00:00
Adam Seaton
17a45d4c94
[DO NOT MERGE] Update Security String to 2017-06-01 for nyc-dev am: d9a5e99599 am: 518f3b9283 am: c347cb4986
...
am: 888cf4cf67
2017-04-12 23:02:45 +00:00
Adam Seaton
ff3f6e29e7
[DO NOT MERGE] Update Security String to 2017-06-05 for lmp-dev
...
am: 91a21e9d12
2017-04-12 23:02:44 +00:00
Adam Seaton
358777c4fe
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39
...
am: c37c1a540d
2017-04-12 22:58:18 +00:00
Adam Seaton
af6f3d396b
[DO NOT MERGE] Update Security String to 2017-06-05 in klp-dev am: c686e139b3 am: 35e82a6404 am: 89ebb51f6b -s ours am: 2d14a7da35 -s ours am: 2d19cbf722 am: fa8973ba33 -s ours am: 9a805d9e3e am: 47e5cb0303 am: d1174126d0 am: c4d46c791a -s ours am: 47d4a317fa am: e966226f39
...
am: c37c1a540d
2017-04-12 22:58:15 +00:00
Adam Seaton
b1e5092b3f
[DO NOT MERGE] Update Security String to 2017-06-01 in klp-dev am: e6a77de43b am: 8dcfa2ac07 am: 386d7ae2e8 -s ours am: 4389a11f4b -s ours am: 65101a958e am: 18c3da68f0 -s ours am: 988fc368d3 am: 14ef6098bb am: a34845a20c am: a73f9cf1f5 -s ours am: 3720a2f373 am: 597a5a8b14
...
am: 859eeaa4ad
2017-04-12 22:58:11 +00:00
