Adam Seaton
a1165c3723
Update Platform Security String to 2019-03-01 for pi-dev
...
Bug:122541777
2019-01-08 13:59:01 -08:00
Elisa Pascual Trevino
e2259df155
[automerger skipped] [DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419
...
am: 8a6d4f5439
-s ours
Change-Id: Ia7428a9c51b06525d070a0319b606bec7fcf5e62
2018-12-07 12:15:02 -08:00
Elisa Pascual Trevino
b25932150d
Merge "[DO NOT MERGE] Security String update to 2019-02-05 Bug: 120144419" into pi-dev
2018-12-03 23:48:04 +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
7c221cf3f3
[automerger skipped] [DO NOT MERGE] Security String update to 2019-02-01 Bug: 120144419
...
am: 60fa5f84ee
-s ours
Change-Id: I3b9c5760e3da7fa59d31db0eff54bc385cd9c1ca
2018-12-03 14:50:49 -08: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
Elisa Pascual Trevino
a9c8e6165e
[DO NOT MERGE] Security String update to 2019-02-05
...
Bug: 120144419
2018-11-28 23:37:10 +00:00
Elisa Pascual Trevino
14b4156d8d
[DO NOT MERGE] Security String update to 2019-02-01
...
Bug: 120144419
2018-11-28 20:24:31 +00:00
Lubo Hristov
8163234246
[DO NOT MERGE] Security string update to 2019-01-05
...
bug:118903919
2018-11-06 14:01:11 -08:00
Lubo Hristov
1ce690dda1
[DO NOT MERGE] Security string update to 2019-01-01
...
bug:118903919
2018-11-06 13:59:10 -08:00
Adam Seaton
f87871f6dc
[automerger skipped] [DO NOT MERGE] Update platform security string to 2018-12-05 bug: 117667960
...
am: 7af38a13f3
-s ours
Change-Id: I293bb8215e243e09203e3b42cf19c183075d7056
2018-10-15 18:12:21 -07:00
TreeHugger Robot
59b5750566
Merge "[DO NOT MERGE]Update Security String to 2018-12-05 for December release bug: 117667960" into pi-dev
2018-10-15 23:59:17 +00:00
Adam Seaton
61ec1b57bd
[automerger skipped] [DO NOT MERGE] Update platform security String to 2018-12-01 bug:117667960
...
am: b43ff9d8f5
-s ours
Change-Id: Ie93bde7af1eef47c5d351839eb06c01cb6023892
2018-10-15 15:45:42 -07:00
Adam Seaton
1e6d1d603b
[DO NOT MERGE]Update Security String to 2018-12-05 for December release
...
bug: 117667960
2018-10-15 22:06:19 +00:00
Adam Seaton
d6edd2123c
[DO NOT MERGE] Update Security String to 2018-12-01 for December Release
...
bug:117667960
2018-10-12 22:41:19 +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
e3a2c209bc
[automerger skipped] [DO NOT MERGE] Update platform security string to 2018-11-05 on oc-mr1-dev bug:114110585
...
am: 281cb3b172
-s ours
Change-Id: Ia4b440c97cf8f6816fac57d390dbe6058fe61069
2018-09-10 19:06:29 -07:00
Adam Seaton
8ce169d2d0
[automerger skipped] [DO NOT MERGE] Update platform security string to 2018-11-01 on oc-mr1-dev Bug:114110585
...
am: b703503c1d
-s ours
Change-Id: Ib4e9523aeb774343105f292c1fec6a81cf906d61
2018-09-10 19:06:14 -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
Elisa Pascual Trevino
c468fc20b0
Merge changes Id72175ed,I5f83105c into pi-dev
...
* changes:
Update platform security string to 2018-11-05 on pi-dev & master Bug:114110585
Update platform security string to 2018-11-01 on pi-dev & master Bug:114110585
2018-09-10 22:56:43 +00:00
JP Sugarbroad
1d7ea5a541
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9
am: 073a48b27d
...
am: aebb4e4c60
Change-Id: I2454672f674809a6a30da0db4a31a2256861fa43
2018-09-10 15:10:51 -07:00
JP Sugarbroad
428cebcd7b
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
am: 5c6df3c9a2
am: cd5dfa01ed
skipped: 428866c804
am: 58265f83b2
am: 422182a1ac
...
am: 839e8e5621
-s ours
Change-Id: Ib219842c69d669b83bcc8652e914425d5fe2fbec
2018-09-10 15:09:33 -07:00
JP Sugarbroad
aebb4e4c60
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev am: 3266dbabf9
...
am: 073a48b27d
Change-Id: I298dbc1500895ff6d3802008ad636f74482e2fd3
2018-09-10 15:06:18 -07:00
JP Sugarbroad
839e8e5621
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
am: 5c6df3c9a2
am: cd5dfa01ed
skipped: 428866c804
am: 58265f83b2
...
am: 422182a1ac
Change-Id: Idefb550cc541e6e59c2d208b9c08fa110636def5
2018-09-10 15:05:14 -07:00
JP Sugarbroad
073a48b27d
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
...
am: 3266dbabf9
Change-Id: I7cb706927b8b155820c74d8c8635b4b0fac377d5
2018-09-10 15:00:53 -07:00
JP Sugarbroad
422182a1ac
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
am: 5c6df3c9a2
am: cd5dfa01ed
skipped: 428866c804
...
am: 58265f83b2
Change-Id: I7b25a2885d197236a0ad8ccd6fe53f272a5fb3b3
2018-09-10 14:59:16 -07:00
JP Sugarbroad
3266dbabf9
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into oc-dev
...
* changes:
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
am: f74efccc8d
skipped: 0c824a631e
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
am: f74efccc8d
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
[RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
5869cd6ac9
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into cw-f-dev
...
* changes:
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
[RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
7728c817e3
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr1-dev
...
* changes:
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
[RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
6b46dac5a9
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-dr1-dev
...
* changes:
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
[RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:21 +00:00
JP Sugarbroad
4f6e887488
Merge "[RESTRICT AUTOMERGE] Remove build/libs" into nyc-dev
2018-09-10 21:49:21 +00:00
JP Sugarbroad
2ba5f007a9
Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-mr2-dev
...
* changes:
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
am: f74efccc8d
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
[RESTRICT AUTOMERGE] Remove build/libs
2018-09-10 21:49:20 +00:00
Elisa Pascual Trevino
dd737c0961
Update platform security string to 2018-11-05 on pi-dev & master
...
Bug:114110585
2018-09-06 23:06:33 +00:00
Elisa Pascual Trevino
2e6c06ba1b
Update platform security string to 2018-11-01 on pi-dev & master
...
Bug:114110585
2018-09-06 21:50:25 +00:00
Colin Cross
a113745d1f
Track more static dependencies for notice files
...
Track transitive static dependencies of native binaries, and
and direct and transitive static dependencies of java and app
modules.
Bug: 112331930
Test: m checkbuild
Change-Id: I0e19971033d6254bfbb6555f0e68fd5e529569c6
Merged-In: I0e19971033d6254bfbb6555f0e68fd5e529569c6
(cherry picked from commit 579668b122
)
2018-08-16 22:44:27 +00:00
Adam Seaton
d8186f43a7
[automerger skipped] DO NOT MERGE Update platform security string to 2018-10-05 bug:112535135
...
am: 090027fb46
-s ours
Change-Id: I6d5364d1d0bcbc2960ea259a25ceeab4b24b4ead
2018-08-15 18:32:26 -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
61ddf1fa27
Update platform security string to 2018-10-05 on pi-dev & master
...
bug: 112535135
2018-08-13 09:34:24 -07:00
Android Build Merger (Role)
58265f83b2
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
am: 5c6df3c9a2
am: cd5dfa01ed
skipped: 428866c804
...
Change-Id: I3d887e3be355404a171b84fe02111ec35ca29887
2018-07-20 00:08:12 +00:00
Android Build Merger (Role)
428866c804
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
am: 5c6df3c9a2
am: cd5dfa01ed
...
Change-Id: Iec882319f93d829c4721bbeec852f5eafdec538d
2018-07-20 00:08:11 +00:00
Android Build Merger (Role)
cd5dfa01ed
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
am: 5c6df3c9a2
...
Change-Id: I2ef3465b53d7fdbac1ec53bd6aead997234c2d4e
2018-07-20 00:08:10 +00:00
Android Build Merger (Role)
5c6df3c9a2
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
am: 69d914c57b
...
Change-Id: Ic00e7b9ba3443b444528092b1e0fba62182fb25c
2018-07-20 00:08:08 +00:00
Android Build Merger (Role)
69d914c57b
[automerger] [RESTRICT AUTOMERGE] Add new Android.mk to handle repo move am: fd72eaab91
...
Change-Id: I3525350c7efdc6566fd9999e90610809c132d6b8
2018-07-20 00:08:06 +00:00
JP Sugarbroad
fd72eaab91
[RESTRICT AUTOMERGE] Add new Android.mk to handle repo move
...
We're moving the platform/build repository down a level, then symlinking
the directories and necessary files back into build/. So if we're still
in build/, keep searching for Android.mk files, otherwise stop, since
they'll be found through the symlinks.
Bug: 109817231
Change-Id: I057957e9b201c14dee185f9c00df157f178d8a31
2018-07-20 00:08:05 +00:00
Android Build Merger (Role)
ef7d325c7f
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
am: f74efccc8d
skipped: 0c824a631e
...
Change-Id: Ifd7d207bb75af2019ddb2c0c07e93a864af9633d
2018-07-19 22:53:15 +00:00
Android Build Merger (Role)
0c824a631e
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
am: f74efccc8d
...
Change-Id: I1a5c817c43b712148c2d88398c9e27d879ded8cc
2018-07-19 22:53:14 +00:00
Android Build Merger (Role)
f74efccc8d
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
am: 2df512843f
...
Change-Id: Ifc4833e72b81040b196bf112d249c01a8c8e9763
2018-07-19 22:53:12 +00:00
Android Build Merger (Role)
2df512843f
[automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
am: 41a932d505
...
Change-Id: I6d931b90bbd08c2b7112a0ab514bca1a5f3aa044
2018-07-19 22:53:11 +00:00