8347c5baef
Merge "Added support for using R8 instead of Proguard + dx" am: 9047dce212
...
am: 6836c47b8b
2017-10-24 06:50:11 +00:00
6836c47b8b
Merge "Added support for using R8 instead of Proguard + dx"
...
am: 9047dce212
2017-10-24 06:45:36 +00:00
9047dce212
Merge "Added support for using R8 instead of Proguard + dx"
2017-10-24 06:39:09 +00:00
6a17c27b71
Merge "build: fix builds when first_api_level isn't defined as property" into oc-mr1-dev
...
am: 25268c1093
2017-10-24 03:59:53 +00:00
25268c1093
Merge "build: fix builds when first_api_level isn't defined as property" into oc-mr1-dev
2017-10-24 03:56:38 +00:00
a33b7a5750
Merge "Go: Disable libartd by default" into oc-mr1-dev
...
am: 8e813f3ebb
2017-10-24 03:42:23 +00:00
8e813f3ebb
Merge "Go: Disable libartd by default" into oc-mr1-dev
2017-10-24 03:39:15 +00:00
b79196f0ca
build: fix builds when first_api_level isn't defined as property
...
Bug: 67965044
Test: Build pixel
Change-Id: I4bce5a4f4d0751a30bf7abda0da5e7d73313c9ef
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-10-24 11:59:40 +09:00
43ee18cbdf
Merge "Move ro.product.first_api_level to vendor/build.prop" into oc-mr1-dev
...
am: f15cde7b64
2017-10-24 02:11:17 +00:00
f15cde7b64
Merge "Move ro.product.first_api_level to vendor/build.prop" into oc-mr1-dev
2017-10-24 02:02:43 +00:00
f65e68c079
Merge "Add ro.vndk.version property" am: 9d3d271673
...
am: 505ed24fbc
2017-10-24 01:29:39 +00:00
505ed24fbc
Merge "Add ro.vndk.version property"
...
am: 9d3d271673
2017-10-24 01:24:29 +00:00
9d3d271673
Merge "Add ro.vndk.version property"
2017-10-24 01:17:01 +00:00
fea5545ffc
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d am: e38beb27b7 am: a028a4205d am: 97a05c4593 am: ec5d8daaa2 -s ours am: 869e4a5300 am: b51b52411a
...
am: 6e12afad23
2017-10-23 23:52:29 +00:00
6e12afad23
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d am: e38beb27b7 am: a028a4205d am: 97a05c4593 am: ec5d8daaa2 -s ours am: 869e4a5300
...
am: b51b52411a
2017-10-23 23:47:52 +00:00
1995e93e1b
Merge "Use space-separated coverage paths." am: f7a596a161
...
am: 84a873dd50
2017-10-23 23:47:45 +00:00
84a873dd50
Merge "Use space-separated coverage paths."
...
am: f7a596a161
2017-10-23 23:44:44 +00:00
b51b52411a
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d am: e38beb27b7 am: a028a4205d am: 97a05c4593 am: ec5d8daaa2 -s ours
...
am: 869e4a5300
2017-10-23 23:42:20 +00:00
869e4a5300
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d am: e38beb27b7 am: a028a4205d am: 97a05c4593
...
am: ec5d8daaa2
2017-10-23 23:38:51 +00:00
f7a596a161
Merge "Use space-separated coverage paths."
2017-10-23 23:38:49 +00:00
ec5d8daaa2
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d am: e38beb27b7 am: a028a4205d
...
am: 97a05c4593
2017-10-23 23:33:44 +00:00
9411f9b4dc
Move ro.product.first_api_level to vendor/build.prop
...
Shipping API level is associated with the vendor image. When
a device ships in, say, O and is then run against the O-MR1
GSI image, the shipping API level is currently reported as
the shipping API level which the GSI was built with. This means
that various tests and control flows assume that the image
is the newest possible image. However, this is not the case.
Bug: 67965044
Test: boot on pixel
Change-Id: If18cc99e2599957d88860e0902a99ff3f67e5fd8
2017-10-24 08:32:07 +09:00
97a05c4593
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d am: e38beb27b7
...
am: a028a4205d
2017-10-23 23:31:06 +00:00
a028a4205d
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev am: deca8f381d
...
am: e38beb27b7
2017-10-23 23:28:33 +00:00
51f362a0ff
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d am: c19579df66 am: 754caa431b am: e66876f72b am: 9c3d0e9534 -s ours am: 8a173cf77d am: bcca9210a9
...
am: 730ddaba02
2017-10-23 23:25:00 +00:00
e38beb27b7
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev
...
am: deca8f381d
2017-10-23 23:24:02 +00:00
a5edb61ea5
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b am: cfd9cfa9b0 am: 35f2bfc71b am: c84b354db1 am: 7365c3b5fd -s ours am: 69894c0222 am: 82840f3318
...
am: d455d06f6c
2017-10-23 23:21:35 +00:00
730ddaba02
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d am: c19579df66 am: 754caa431b am: e66876f72b am: 9c3d0e9534 -s ours am: 8a173cf77d
...
am: bcca9210a9
2017-10-23 23:21:29 +00:00
d455d06f6c
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b am: cfd9cfa9b0 am: 35f2bfc71b am: c84b354db1 am: 7365c3b5fd -s ours am: 69894c0222
...
am: 82840f3318
2017-10-23 23:19:03 +00:00
deca8f381d
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on nyc-dev. Bug: 67774760" into nyc-dev
2017-10-23 23:18:27 +00:00
bcca9210a9
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d am: c19579df66 am: 754caa431b am: e66876f72b am: 9c3d0e9534 -s ours
...
am: 8a173cf77d
2017-10-23 23:16:55 +00:00
8a173cf77d
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d am: c19579df66 am: 754caa431b am: e66876f72b
...
am: 9c3d0e9534
2017-10-23 23:13:49 +00:00
82840f3318
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b am: cfd9cfa9b0 am: 35f2bfc71b am: c84b354db1 am: 7365c3b5fd -s ours
...
am: 69894c0222
2017-10-23 23:11:54 +00:00
9c3d0e9534
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d am: c19579df66 am: 754caa431b
...
am: e66876f72b
2017-10-23 23:09:45 +00:00
69894c0222
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b am: cfd9cfa9b0 am: 35f2bfc71b am: c84b354db1
...
am: 7365c3b5fd
2017-10-23 23:09:18 +00:00
7365c3b5fd
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b am: cfd9cfa9b0 am: 35f2bfc71b
...
am: c84b354db1
2017-10-23 23:07:18 +00:00
e66876f72b
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d am: c19579df66
...
am: 754caa431b
2017-10-23 23:07:12 +00:00
754caa431b
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours am: a417f92e6d
...
am: c19579df66
2017-10-23 23:04:40 +00:00
c84b354db1
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b am: cfd9cfa9b0
...
am: 35f2bfc71b
2017-10-23 23:02:42 +00:00
c19579df66
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1 am: 960319ef76 -s ours
...
am: a417f92e6d
2017-10-23 23:00:07 +00:00
a40e4c85a1
Merge "Fix an issue in assert-max-image-size." am: d690ca5b8a
...
am: a89179ad7c
2017-10-23 22:59:38 +00:00
35f2bfc71b
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours am: f95b1f3e5b
...
am: cfd9cfa9b0
2017-10-23 22:57:39 +00:00
a417f92e6d
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f am: 0ef4e8a5e1
...
am: 960319ef76
2017-10-23 22:57:18 +00:00
cfd9cfa9b0
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31 am: 1a5eaff412 -s ours
...
am: f95b1f3e5b
2017-10-23 22:55:14 +00:00
a89179ad7c
Merge "Fix an issue in assert-max-image-size."
...
am: d690ca5b8a
2017-10-23 22:52:58 +00:00
960319ef76
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a am: c4a501ce0f
...
am: 0ef4e8a5e1
2017-10-23 22:52:58 +00:00
f95b1f3e5b
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb am: 81a4c67d31
...
am: 1a5eaff412
2017-10-23 22:52:48 +00:00
1a5eaff412
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6 am: 4739b13afb
...
am: 81a4c67d31
2017-10-23 22:50:31 +00:00
0ef4e8a5e1
Merge "[DO NOT MERGE] Updating Platform Security String to 2017-12-01 on mnc-dev. Bug: 67774760" into mnc-dev am: 948d98b31a
...
am: c4a501ce0f
2017-10-23 22:50:28 +00:00
81a4c67d31
[DO NOT MERGE] Update LMP Security string to 2017-12-01 Bug: 67774760 am: 804540a3a7 -s ours am: dc25041602 -s ours am: 4e4fedefd6
...
am: 4739b13afb
2017-10-23 22:47:56 +00:00
Søren Gjesse