Commit graph

13853 commits

Author SHA1 Message Date
Adam Seaton
796d90c141 [Do Not Merge] Update Platform Security String to 2019-05-05 for oc-mr1-dev
Bug:128322951
2019-03-11 20:50:55 +00:00
Elisa Pascual Trevino
801e91776e [DO NOT MERGE] Update Security String to 2019-05-01 in oc-mr1-dev
Bug: 128322951
2019-03-11 18:06:15 +00:00
Adam Seaton
7d7a3cbcc8 [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev
Bug:124119313
2019-02-19 18:49:09 +00:00
Adam Seaton
eb164e06b2 [DO NOT MERGE] Update Platform Security String to 2019-03-05 for oc-mr1-dev Bug:122541777 2019-01-15 19:14:22 +00:00
Adam Seaton
6698efad06 [DO NOT MERGE] Update Platform Security String to 2019-03-01 for oc-mr1-dev Bug:122541777 2019-01-14 22:21:01 +00:00
Elisa Pascual Trevino
8a6d4f5439 [DO NOT MERGE] Security String update to 2019-02-05
Bug: 120144419
2018-12-03 23:45:54 +00:00
Elisa Pascual Trevino
60fa5f84ee [DO NOT MERGE] Security String update to 2019-02-01
Bug: 120144419
2018-12-03 19:59:11 +00:00
Adam Seaton
7af38a13f3 [DO NOT MERGE] Update platform security string to 2018-12-05
bug: 117667960
2018-10-12 14:23:49 -07:00
Adam Seaton
b43ff9d8f5 [DO NOT MERGE] Update platform security String to 2018-12-01
bug:117667960
2018-10-12 14:11:24 -07:00
Adam Seaton
281cb3b172 [DO NOT MERGE] Update platform security string to 2018-11-05 on
oc-mr1-dev
bug:114110585
2018-09-10 16:42:41 -07:00
Adam Seaton
b703503c1d [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev
Bug:114110585
2018-09-10 16:37:40 -07:00
Adam Seaton
090027fb46 DO NOT MERGE Update platform security string to 2018-10-05
bug:112535135
2018-08-13 18:41:41 +00:00
Adam Seaton
6bc223c9af Updating Platform Security String to 2018-09-05
Bug: 111501777
2018-07-16 10:17:21 -07:00
Adam Seaton
f6bee62b8e [DO NOT MERGE] Update Platform Security String to 2018-08-05 for August
Bug:109889880
2018-06-18 17:28:17 +00:00
Adam Seaton
cfbe84b8a0 DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev
Bug:79883349
2018-06-01 23:00:36 +00:00
Adam Seaton
85a18252b7 DO NOT MERGE: Updating security string for oc-mr1-dev to 2018-06-05
Bug:78240102
Change-Id: Ib9d8c11ecf9212711a9679972c15354c8dd56857
2018-04-18 21:25:50 +00:00
Adam Seaton
cd85c0da4a DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05
Bug: 74345861
Change-Id: I85a9878bfd441bc95242023f713b6848992bea06
2018-03-13 13:04:40 -07:00
Adam Seaton
4a57b9de88 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2
am: 1bdbab9542

Change-Id: If6a0846e43e34127265f2415a94f86cb2d5e53fb
2018-02-14 00:09:35 +00:00
Adam Seaton
1bdbab9542 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev
am: 402397c7f2

Change-Id: I56dac0e3f017fcdd57e522dccb36ab09cbb15ae2
2018-02-14 00:05:33 +00:00
Adam Seaton
7231e99020 Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9
am: 05e66a80dc

Change-Id: Ia769104e933025596c98b66598091eca3e3a860d
2018-02-13 23:54:31 +00:00
Adam Seaton
05e66a80dc Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev
am: 656fd837e9

Change-Id: Ic22c80e40cff1fe0afea3f26741d10c8a949b27b
2018-02-13 23:49:57 +00:00
Adam Seaton
312d7e7a3c [DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev
Bug:73240847
2018-02-13 21:40:38 +00:00
Adam Seaton
accee92300 [DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev
Bug:73240847
2018-02-13 21:14:31 +00:00
Elisa Pascual Trevino
eaba92c92c [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241 am: 44861dc6dd
am: d57400b494

Change-Id: If650f336cf65ecc97eca7a2095dd77052dfd8fc2
2018-01-12 20:31:04 +00:00
Elisa Pascual Trevino
d57400b494 [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev Bug:71860241
am: 44861dc6dd

Change-Id: If466dfd2c187d532256400c542a2365255db8e3f
2018-01-12 20:25:27 +00:00
Elisa Pascual Trevino
44861dc6dd [DO NOT MERGE] Update security string to 2018-03-05 for oc-dev
Bug:71860241
2018-01-12 17:38:16 +00:00
Elisa Pascual Trevino
b02a234540 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev am: 48539e0ff6
am: 560b80b913

Change-Id: I3e98e6c0e4c054460a9972cb2caf1149e0713282
2018-01-12 01:49:46 +00:00
Elisa Pascual Trevino
560b80b913 Merge "[DO NOT MERGE] Update security string to 2018-03-01 for oc-dev Bug:71860241" into oc-dev
am: 48539e0ff6

Change-Id: I4ee78230426155da8d620bfed6df81b5073e9de5
2018-01-12 01:44:15 +00:00
Elisa Pascual Trevino
275847767a [DO NOT MERGE] Update security string to 2018-03-01 for oc-dev
Bug:71860241
2018-01-11 22:51:26 +00:00
Colin Cross
fcb0d149b4 Revert "Revert "Support <dir>:<file> for LOCAL_JAVA_RESOURCE_FILES""
This reverts commit 15a2fa21a8.

This reapplies I83f3d45bdd156200308dc7ed0e0fea5d895d37a6 without
the error on absolute paths if they are in $(OUT_DIR).

BUG: 68305853
Test: OUT_DIR=/tmp/out mmma -j art/tools/ahat
Change-Id: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
Merged-In: Ia0b156d21ba4b95eb3004d61f6fae2f4341fd39c
2017-12-15 20:19:38 +00:00
Adam Seaton
e34617a4cc [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883 am: fb5f3b5add
am: 9e67329b15

Change-Id: Ica0fc60b65b6bef7dd72de40c56e9fbdef2e2e64
2017-12-14 20:13:44 +00:00
Adam Seaton
9e67329b15 [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev bug:70348883
am: fb5f3b5add

Change-Id: Ic0f372df927167d890bf29554bc737a6c4aa2b1b
2017-12-14 20:08:30 +00:00
Adam Seaton
fb5f3b5add [DO NOT MERGE] Update security string to 2018-02-05 for oc-mr1-dev
bug:70348883

Change-Id: I3e6a87e66cd2c113d2f8fc0e9572b0a2744a6515
2017-12-14 17:30:59 +00:00
Adam Seaton
f1a38a2ef0 Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev am: 3c12119266
am: 07de097829

Change-Id: Ifd5ff222586f78404a58ad1d73e03d01fcf983dc
2017-12-14 02:09:34 +00:00
Adam Seaton
07de097829 Merge "[DO NOT MERGE] Update security string to 2018-02-01 for oc-dev bug:70348883" into oc-dev
am: 3c12119266

Change-Id: I24ffbb6560091677f6bf71ae0c7c705eb2b894f2
2017-12-14 01:56:13 +00:00
Adam Seaton
ee2346fa89 [DO NOT MERGE] Update security string to 2018-02-01 for oc-dev
bug:70348883

Change-Id: Ib87775083eb064c485a44dffcf3b4630d33d39c5
2017-12-13 23:02:17 +00:00
Badash
2f8a8b8a18 initial add sts to build am: bb7a920294
am: b4bd17c9ad

Change-Id: I94ff95c77545981dfe7e466e4e1a105f45e38472
2017-12-06 18:19:05 +00:00
Badash
b4bd17c9ad initial add sts to build
am: bb7a920294

Change-Id: I63038aeb98fa6008e1217f8caf7ec749a0ea749e
2017-12-06 18:16:11 +00:00
Badash
bb7a920294 initial add sts to build
Test: Local build with other CLs in topic

Bug: 67456333
Change-Id: Ieea499fc22b6dff87dfb19fb8b9446fa449152ea
(cherry picked from commit a4560bb0cb)
2017-12-05 22:17:31 +00:00
Elisa Pascual Trevino
43738d2a71 [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226 am: b58800a22c
am: ec071e07df

Change-Id: I8b625eee6ed5b782649d7a6d4b98b3e3acc4ac31
2017-11-14 00:54:25 +00:00
Elisa Pascual Trevino
ec071e07df [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01 Bug: 69257226
am: b58800a22c

Change-Id: I15c6ee36fe858323759bcd91132b604adf0c3cc5
2017-11-14 00:52:23 +00:00
Elisa Pascual Trevino
b58800a22c [DO NOT MERGE] Update Security String to 2018-01-05 from 2018-01-01
Bug: 69257226
2017-11-13 22:23:06 +00:00
Elisa Pascual Trevino
ed2f52ccb5 Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev am: 9a8d84b8ed
am: ec439b54fb

Change-Id: I54c898d6a0d0dd5edc4ecbd6a069741079aaa3ea
2017-11-13 21:56:16 +00:00
Elisa Pascual Trevino
ec439b54fb Merge "[DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05 Bug: 69257226" into oc-dev
am: 9a8d84b8ed

Change-Id: I01c2010599a495aec3943cda02ea22f85fdae29d
2017-11-13 21:54:22 +00:00
Elisa Pascual Trevino
c53a14f174 [DO NOT MERGE] Update Security String to 2018-01-01 from 2017-12-05
Bug: 69257226
2017-11-13 19:28:32 +00:00
Adam Seaton
b6cd7f71f9 Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev am: 8fdda7d80d
am: 4ec4999b54

Change-Id: I1fc9a861ca5fc9c641e44dfb14fa6e23bb656e93
2017-11-03 23:58:40 +00:00
Adam Seaton
4ec4999b54 Merge "Update Security String to 2017-12-05 for December Security Bug: 67774760" into oc-dev
am: 8fdda7d80d

Change-Id: Ib1b6381be2565f9cb5d9e5e8a798de8240592774
2017-11-03 23:54:45 +00:00
Sandeep Patil
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
Steven Moreland
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
Adam Seaton
81ee575d52 Update Security String to 2017-12-05 for December Security
Bug: 67774760
2017-10-23 22:14:35 +00:00