Adam Seaton
288fd15d69
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b
-s ours am: 0a97d3f909
am: ddac9519eb
-s ours am: 7ad3c1407c
am: 16dcd532a0
am: 535ade48f8
...
am: 3f5593376d
-s ours
Change-Id: I7b94b0638f33d133ea45d69986ac853b613d4f44
2017-05-19 19:29:04 +00:00
Adam Seaton
bf2d4968da
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
am: 54f2af92b2
...
am: ad8ec7f781
-s ours
Change-Id: I8b558f6db1b76d4169e10f78be020e8e605c0968
2017-05-19 19:29:04 +00:00
Adam Seaton
e10ce80409
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours am: 4cfcc9fe73
am: 8a893de625
-s ours am: 9f169ddbcd
am: 5c7bac6231
...
am: 1899a63f1d
Change-Id: Ib018b81b77ca749333a4700049a525523e2f83c1
2017-05-19 19:27:37 +00:00
Adam Seaton
d2892c6d67
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
am: eaf073cbee
am: ec42d2e0a5
-s ours
...
am: d86a6599f8
Change-Id: I92dfce37a656ac3dfd9904622f453bd6da08a1c5
2017-05-19 19:27:06 +00:00
Adam Seaton
3f5593376d
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b
-s ours am: 0a97d3f909
am: ddac9519eb
-s ours am: 7ad3c1407c
am: 16dcd532a0
...
am: 535ade48f8
Change-Id: I3c084d863cb3b091c0e7ebf7783969c9c7125fa1
2017-05-19 19:27:05 +00:00
Adam Seaton
2af63a8402
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
-s ours am: ff461ef52c
-s ours am: 5412c380f4
-s ours am: 1ffe37a8d3
-s ours
...
am: 7155b13e7c
-s ours
Change-Id: I7ecbbded883175486e22ec089abe368105066ea5
2017-05-19 19:27:04 +00:00
Adam Seaton
ad8ec7f781
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d
...
am: 54f2af92b2
Change-Id: I18f6472f3d3bdc7af56c95b200213ad804c38039
2017-05-19 19:27:04 +00:00
Adam Seaton
1899a63f1d
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours am: 4cfcc9fe73
am: 8a893de625
-s ours am: 9f169ddbcd
...
am: 5c7bac6231
Change-Id: Idc1d79faa12fdd938f57e1678fbb34bbbc9c6bcd
2017-05-19 19:26:00 +00:00
Adam Seaton
9a9f9cfa29
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
am: eaf073cbee
am: ec42d2e0a5
am: 4a431f6cd7
-s ours
...
am: 55eef13e5a
Change-Id: Ibe88c3012c127bc1bee80eb3388276c68bdb667a
2017-05-19 19:25:36 +00:00
Adam Seaton
535ade48f8
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b
-s ours am: 0a97d3f909
am: ddac9519eb
-s ours am: 7ad3c1407c
...
am: 16dcd532a0
Change-Id: Ic6b017fd04b00a2cf65336e76386d94cabc8b13a
2017-05-19 19:25:36 +00:00
Adam Seaton
7155b13e7c
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
-s ours am: ff461ef52c
-s ours am: 5412c380f4
-s ours
...
am: 1ffe37a8d3
-s ours
Change-Id: Id04a866435207c4a4c2d84ab132df034a7fcf112
2017-05-19 19:25:35 +00:00
Adam Seaton
54f2af92b2
[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695
...
am: e2d22d501d
Change-Id: Ic8419e3d3b12a90173888aff21a11b18f2ed2bbb
2017-05-19 19:25:35 +00:00
Adam Seaton
55eef13e5a
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
am: eaf073cbee
am: ec42d2e0a5
...
am: 4a431f6cd7
-s ours
Change-Id: I82450b1647c93a33c95e02b7d161d9c85887c6eb
2017-05-19 19:23:35 +00:00
Adam Seaton
4a431f6cd7
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
am: eaf073cbee
...
am: ec42d2e0a5
Change-Id: If34438154b69fc5612e4ada7c15ad6d62221f5c8
2017-05-19 19:22:35 +00:00
Adam Seaton
1ffe37a8d3
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
-s ours am: ff461ef52c
-s ours
...
am: 5412c380f4
-s ours
Change-Id: Icb7123ea33c0a0d24b9b0e1152ce3a4b007c4e9b
2017-05-19 19:22:34 +00:00
Adam Seaton
d86a6599f8
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
am: eaf073cbee
...
am: ec42d2e0a5
-s ours
Change-Id: I0199ddbe2e8b894d175cb893223a74a2e55ad1f1
2017-05-19 19:22:34 +00:00
Adam Seaton
5c7bac6231
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours am: 4cfcc9fe73
am: 8a893de625
-s ours
...
am: 9f169ddbcd
Change-Id: I9d563934bf1454022707c9f55f4d97e92ce077d0
2017-05-19 19:22:26 +00:00
Adam Seaton
16dcd532a0
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b
-s ours am: 0a97d3f909
am: ddac9519eb
-s ours
...
am: 7ad3c1407c
Change-Id: I8564bba5201302290fdca4d3350d0cbc7a97ac7b
2017-05-19 19:22:05 +00:00
Adam Seaton
ec42d2e0a5
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
...
am: eaf073cbee
Change-Id: I3b538f830ac043844bf059c5ff927c09f68f21bd
2017-05-19 19:20:06 +00:00
Adam Seaton
5412c380f4
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
am: 7fe1da4f84
-s ours
...
am: ff461ef52c
-s ours
Change-Id: I7d8f48b13d91643e26c2f30f1f284136bb88c2c4
2017-05-19 19:20:04 +00:00
Adam Seaton
9f169ddbcd
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours am: 4cfcc9fe73
...
am: 8a893de625
-s ours
Change-Id: I7407e2dd2411bc519a5499cf74c284c3fb74bdf0
2017-05-19 19:19:01 +00:00
Adam Seaton
eaf073cbee
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
...
am: 7fe1da4f84
Change-Id: Iebeb13cac9e257d53cd1b4ae726b9a80992484d8
2017-05-19 19:18:35 +00:00
Adam Seaton
ff461ef52c
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
am: 7b94aecada
...
am: 7fe1da4f84
-s ours
Change-Id: I87ff26565bbe4fbf92bc9581c5cb42b0a7ef35b3
2017-05-19 19:18:33 +00:00
Adam Seaton
7ad3c1407c
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b
-s ours am: 0a97d3f909
...
am: ddac9519eb
-s ours
Change-Id: Id563de5f09d1d033751273deb372cc9cc57e2c25
2017-05-19 19:18:33 +00:00
Adam Seaton
8a893de625
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev am: 11af5514df
-s ours
...
am: 4cfcc9fe73
Change-Id: I2f513d397ae199b0ea334d2254ae00a73e0b8026
2017-05-19 19:16:54 +00:00
Adam Seaton
7fe1da4f84
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours am: ee22290a47
...
am: 7b94aecada
Change-Id: I5282c826869ad17bfafd809d92514d20cab4e3a9
2017-05-19 19:16:36 +00:00
Vishwath Mohan
57709a5214
Merge "Enable incremental builds for ASAN. (make)" am: 1c84862c36
am: babf44a1c7
am: 8294b64493
...
am: 09eaf03378
Change-Id: I6c59aaa5343932022c00b66496d05376929313c2
2017-05-19 19:16:36 +00:00
Adam Seaton
ddac9519eb
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b
-s ours
...
am: 0a97d3f909
Change-Id: Id4cb1b9f7811a47a0c2781e54c0571e8d5eaca3f
2017-05-19 19:16:34 +00:00
Adam Seaton
4cfcc9fe73
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
...
am: 11af5514df
-s ours
Change-Id: If06ae105d14f94816787580e5146bfd38fc85126
2017-05-19 19:14:57 +00:00
Adam Seaton
7b94aecada
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
am: ad860c3d0d
-s ours
...
am: ee22290a47
Change-Id: I29104f6178234b5d41a692b3d7546319f726a5ef
2017-05-19 19:14:35 +00:00
Vishwath Mohan
09eaf03378
Merge "Enable incremental builds for ASAN. (make)" am: 1c84862c36
am: babf44a1c7
...
am: 8294b64493
Change-Id: I9a498ffa1b37fe61abff2c1dea163e8a2ab758f2
2017-05-19 19:14:35 +00:00
Adam Seaton
0a97d3f909
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev
...
am: 18fc68549b
-s ours
Change-Id: Ib3882885ecaf352fc96578de1e5b12e1ae23a8c8
2017-05-19 19:14:34 +00:00
Adam Seaton
ee22290a47
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
am: 7d58605e6b
...
am: ad860c3d0d
-s ours
Change-Id: Ia4e120c452a58d96125dd1263cd13809230e5f50
2017-05-19 19:12:34 +00:00
Vishwath Mohan
8294b64493
Merge "Enable incremental builds for ASAN. (make)" am: 1c84862c36
...
am: babf44a1c7
Change-Id: Ibf7a9d43601613135f10149926acbf719db440b7
2017-05-19 19:12:34 +00:00
TreeHugger Robot
11af5514df
Merge "[DO NOT MERGE] Updating security string to 2017-07-05 on lmp-dev bug:38342695" into lmp-dev
2017-05-19 19:12:04 +00:00
Vishwath Mohan
babf44a1c7
Merge "Enable incremental builds for ASAN. (make)"
...
am: 1c84862c36
Change-Id: I8454f01d7c353d1cab05b3542a3e1654263de1ac
2017-05-19 19:10:39 +00:00
Adam Seaton
ad860c3d0d
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
am: 18e5f9b4f6
...
am: 7d58605e6b
Change-Id: I517e0d561a688139c612b12168b19df9bd4db174
2017-05-19 19:10:34 +00:00
TreeHugger Robot
18fc68549b
Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev
2017-05-19 19:09:30 +00:00
Adam Seaton
7d58605e6b
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours am: 2e17d83fcd
...
am: 18e5f9b4f6
Change-Id: I80c6d7913223ff47d6943ddc1f3d509fb37f0afc
2017-05-19 19:09:04 +00:00
Vishwath Mohan
1c84862c36
Merge "Enable incremental builds for ASAN. (make)"
2017-05-19 19:07:41 +00:00
Adam Seaton
18e5f9b4f6
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
am: d872742f52
-s ours
...
am: 2e17d83fcd
Change-Id: I61c5d7645d592863b1abd03057c2dd638aac9c50
2017-05-19 19:07:04 +00:00
Adam Seaton
2e17d83fcd
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours am: a871e8ff81
...
am: d872742f52
-s ours
Change-Id: Ib653835d7a30261bd8080550c1078a504a3c6d18
2017-05-19 19:05:32 +00:00
Adam Seaton
d872742f52
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours am: 387e0bb99a
-s ours
...
am: a871e8ff81
Change-Id: I0c4e6ed39eaf707341be8af7c211764ee438855d
2017-05-19 19:03:33 +00:00
Adam Seaton
a871e8ff81
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
am: 652d99234a
-s ours
...
am: 387e0bb99a
-s ours
Change-Id: Ic9f59110c95f7fbfae6250e6c9e174f0768df755
2017-05-19 19:02:02 +00:00
Adam Seaton
387e0bb99a
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
am: b31b3f6019
...
am: 652d99234a
-s ours
Change-Id: I3d4e03afad44d825336403f23bf6ab79140e994b
2017-05-19 19:00:02 +00:00
Adam Seaton
652d99234a
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695 am: 35d8838aec
...
am: b31b3f6019
Change-Id: Icc8d317d81e868b1f186f69e772d7bde628d80f7
2017-05-19 18:58:32 +00:00
Adam Seaton
b31b3f6019
[DO NOT MERGE]Updating security string to 2017-01-01 on klp-dev bug:38342695
...
am: 35d8838aec
Change-Id: I96a3e567b8a9388ad44aeef45ccda001ab81654b
2017-05-19 18:56:32 +00:00
Isaac Chen
1573baca1b
Generic AOSP system image for non-A/B arm devices
...
aosp_arm_a: for non-A/B 32-bit arm devices
aosp_arm64_a: for non-A/B 64-bit arm devices
Both are based on aosp_arm64_ab (for A/B devices).
Bug: 36153731
Test: build with oc-dev and the resulted system image works on one
32-bit arm device successfully (no 64-bit arm device to test yet).
Change-Id: Ifb5c4239e5c22005e055cfa840feca9c0a92586f
2017-05-19 09:29:21 +00:00
Steven Moreland
2b32469c47
Add soong variable for PRODUCT_FULL_TREBLE.
...
Required to preserve sane defaults for old codebases.
Test: inspect soong.variables
Test: ensure PRODUCT_SHIPPING_API_LEVEL is set in config.mk
Bug: 38415912
Change-Id: I0244fb02754663be3106391c9360fd1b2cc00d4a
2017-05-18 17:16:09 -07:00
Chih-Hung Hsieh
ecd56a5ede
Merge "Recognize new clang and make warnings." am: dd51cfc9a2
am: 6d8d482f79
am: e6a58345bd
...
am: fd3b52addf
Change-Id: Ie3f0539a217cd9673bdabb69f268abb427dcfb2c
2017-05-18 23:39:03 +00:00