StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,543 Commits 1 Branch 0 Tags
f70aa4cde7c49f013afbbe188528fda552acda9c
Commit Graph

43543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Seaton
73acc9e68a Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev 
am: db07ca24cd

Change-Id: I738712b5f72e44b3defdb2fecca60c60a77c4433
 2018-02-14 18:56:01 +00:00
Colin Cross
80eb30f4e1 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS" am: b060ba4b92 am: 4267043041 
am: d7046033f5

Change-Id: I10819ac11574b489d4763bd502ccb3e8465b6cb7
 2018-02-14 18:54:45 +00:00
Colin Cross
d7046033f5 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS" am: b060ba4b92 
am: 4267043041

Change-Id: I9755b011beaf5e0ced2f7a9021854843ce79e0b7
 2018-02-14 18:49:28 +00:00
Jiyong Park
eaf1bb17c1 Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" am: 9c339a76c3 am: fb3d065f9a 
am: a8b46cb432

Change-Id: Ife3b4f7dcc5a7899ddb6ddab1d79255ef57497ac
 2018-02-14 18:49:01 +00:00
Colin Cross
4267043041 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS" 
am: b060ba4b92

Change-Id: If0a1d83a3f452365817684b9ce83c798353f4405
 2018-02-14 18:43:42 +00:00
TreeHugger Robot
db07ca24cd Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into oc-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: skipped: c73989b3fc
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: 7dbf8e1467
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped:  skipped: aa694967c6
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped: 01433de204
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
fd3973733a Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-mr2-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de skipped: 7dbf8e1467
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e skipped: 01433de204
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
8c74825d49 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into cw-f-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e skipped: a827c465de
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1 skipped: affcc08a8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
3fdd107066 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-mr1-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49 skipped: 14f5e7822e
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768 skipped: e621f5b6b1
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
141ab6f0e6 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-dr1-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966 skipped: 8501efda49
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255 skipped: 9108464768
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
TreeHugger Robot
6d265cda61 Merge changes from topics "am-3c619e2a-1f4e-47aa-8753-e1a28443a34e", "am-9f861bb0-3c66-4edc-8d28-54a30e085c78" into nyc-dev 
* changes:
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c skipped: dd276ca966
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb skipped: ccd891285c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c skipped: df3319a7fb
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498 skipped: ab40f0170c
  [automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e skipped: a359a0a255
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573 skipped: b384901f8e
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681 skipped: 6dc142b573
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84 skipped: a80adf5681
  [automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
  [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847
  [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241
 2018-02-14 18:43:37 +00:00
Jiyong Park
a8b46cb432 Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" am: 9c339a76c3 
am: fb3d065f9a

Change-Id: If8559190f1c0e4b25656bda07fdedfbd5c9b82f8
 2018-02-14 18:43:24 +00:00
Jiyong Park
fb3d065f9a Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" 
am: 9c339a76c3

Change-Id: Icbc66efce8a32f0db96d17cc601e8de244e7b397
 2018-02-14 18:38:01 +00:00
Colin Cross
b060ba4b92 Merge "Remove art targets from PARSE_TIME_MAKE_GOALS" 2018-02-14 18:36:15 +00:00
Colin Cross
5b73ab34ed Disable duplicates warnings when merging jars 
There are too many duplicates warnings, disable them until someone
is actually looking at them.

Bug: 69316739
Test: m checkbuild
Change-Id: Ifb67dbf7734b5f53941d110f578c4fe642e36005
 2018-02-14 18:35:37 +00:00
Treehugger Robot
9c339a76c3 Merge "BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES" 2018-02-14 18:27:08 +00:00
Jiyong Park
889773f7ab BUILD_DROIDDOC supports LOCAL_NO_STANDARD_LIBRARIES 
When LOCAL_NO_STANDARD_LIBRARIES is set to true, droiddoc only omits
framework libraries from the required libs. This enables us to use
droiddoc even when frameworks/base is absent (i.e. master-art branch).

Test: m -j core.current.stubs
Test: build in master-art branch
Change-Id: Ia9f0b8bda84b006881b3e62e6573a7784ca56a8c
 2018-02-14 21:16:15 +09:00
bowen_lai
a704ae4ecb Merge "Create symbolic boot vdex files for different ISAs" am: 895a8172ee am: 862a102804 
am: 70077620c0

Change-Id: I83cc2a7c520e45b25f16aa6aa9d7ce146a746857
 2018-02-14 01:35:19 +00:00
bowen_lai
70077620c0 Merge "Create symbolic boot vdex files for different ISAs" am: 895a8172ee 
am: 862a102804

Change-Id: I17f671838d842a0a3c76c1b39a082b536e0eba60
 2018-02-14 01:17:38 +00:00
Christopher Ferris
d0253ef4d5 Merge "Add libc_malloc_hook to list of libraries." am: 184b4d8560 am: d909c94848 
am: 8ff1ffcc7b

Change-Id: I915c457b6c76d5bd487f26263a02682e5a958994
 2018-02-14 01:15:55 +00:00
Christopher Ferris
8ff1ffcc7b Merge "Add libc_malloc_hook to list of libraries." am: 184b4d8560 
am: d909c94848

Change-Id: Iafd2976b5cc2d3e29aa31732670dfc9f6a377207
 2018-02-14 01:10:05 +00:00
bowen_lai
862a102804 Merge "Create symbolic boot vdex files for different ISAs" 
am: 895a8172ee

Change-Id: I226a47f93c3bffee6bf5942f86a983b71bd9367f
 2018-02-14 01:05:46 +00:00
Jaekyun Seok
9cbf2e00df Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631 am: cae2ca8ef5 
am: aabb24c3fc

Change-Id: Ic36f71be5b0d900f13c4d7eb2cb56391110ac90d
 2018-02-14 01:04:42 +00:00
Christopher Ferris
d909c94848 Merge "Add libc_malloc_hook to list of libraries." 
am: 184b4d8560

Change-Id: I7b8303ab179418f86db4946037af044b68caed9b
 2018-02-14 01:02:43 +00:00
Treehugger Robot
895a8172ee Merge "Create symbolic boot vdex files for different ISAs" 2018-02-14 00:59:56 +00:00
Jaekyun Seok
aabb24c3fc Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" am: 42c7cf0631 
am: cae2ca8ef5

Change-Id: I9c5d64073d52735ae8f53bb702d6715771359583
 2018-02-14 00:59:12 +00:00
Jaekyun Seok
cae2ca8ef5 Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" 
am: 42c7cf0631

Change-Id: I7efa870b5649108a2e59b52a682e16e5b8d10420
 2018-02-14 00:55:58 +00:00
Christopher Ferris
184b4d8560 Merge "Add libc_malloc_hook to list of libraries." 2018-02-14 00:49:48 +00:00
Tao Bao
1440313315 Merge "releasetools: Specify max_timestamp for secondary payload." into oc-mr1-dev-plus-aosp 
am: 221d1f4bde  -s ours

Change-Id: I78394c3753093fa6f18a83cf351a562c6d605857
 2018-02-14 00:47:46 +00:00
Treehugger Robot
42c7cf0631 Merge "Enable BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED for full-treble products" 2018-02-14 00:30:23 +00:00
TreeHugger Robot
221d1f4bde Merge "releasetools: Specify max_timestamp for secondary payload." into oc-mr1-dev-plus-aosp 2018-02-14 00:26:57 +00:00
Adam Seaton
1086cb5e47 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2 am: 1bdbab9542 am: 4a57b9de88 
am: 9f4cd386a0  -s ours

Change-Id: Ifd0a79cb0731e99904b116a00a118cec5f9e0149
 2018-02-14 00:19:23 +00:00
Adam Seaton
9f4cd386a0 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev am: 402397c7f2 am: 1bdbab9542 
am: 4a57b9de88

Change-Id: I16382ca753dbe46836a848b1e3224a255d5ad884
 2018-02-14 00:15:41 +00: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
ecebf9c349 Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9 am: 05e66a80dc am: 7231e99020 
am: a540c9466b  -s ours

Change-Id: Iee3445aeb218861e202583f1cc08d24dae902295
 2018-02-14 00:06:45 +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
a540c9466b Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev am: 656fd837e9 am: 05e66a80dc 
am: 7231e99020

Change-Id: I9ed65a0bfddfcdd30873dff9cb683fc08d31f6dc
 2018-02-14 00:01:05 +00:00
Chris Morin
83522a10e1 have patchoat take directories instead of filenames 
patchoat was already ignoring the basename part of the filename passed
to it for both --output-image-file and --output-image-relocation-file.
We can therefore just pass in the directories instead.

Bug: 72828459
Test: make test-art-host-gtest-patchoat_test
Change-Id: I50f2e19fec1fd27433d3e6ec82df0cfb04c43f21
 2018-02-13 15:56:55 -08:00
TreeHugger Robot
402397c7f2 Merge "[DO NOT MERGE] Update Security String to 2018-04-05 in oc-dev Bug:73240847" into oc-dev 2018-02-13 23:56:08 +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
TreeHugger Robot
656fd837e9 Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev 2018-02-13 23:35:05 +00:00
Adam Seaton
819b18263f Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev am: 0d66f2b854 am: 24cbf1d542 am: 0940a73880 
am: c4c2338c69

Change-Id: I98d88b80f0c1120db527a4b89f14286a61a8339f
 2018-02-13 23:19:16 +00:00
Tao Bao
9d0242d93e Merge "releasetools: Allow generating BBOTA for images with shared blocks." am: 9452d84b97 am: 6c453193a1 
am: 7088b88a17

Change-Id: I123238db80af7d60e92da4aef0478f9f5f1a29a5
 2018-02-13 23:13:15 +00:00
Tao Bao
072f2e4784 Merge "releasetools: Remove the unconditional fallback to bsdiff." am: 6392e05813 am: 61fc7f6746 
am: 6b2854d44d

Change-Id: Iac4c743329de3db006ed4a2d3782835a5002490b
 2018-02-13 23:10:28 +00:00
Adam Seaton
c4c2338c69 Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev am: 0d66f2b854 am: 24cbf1d542 
am: 0940a73880

Change-Id: I8f2a5550f1d886cbc789b5c41456cbb05aa72e8c
 2018-02-13 23:09:40 +00:00
Adam Seaton
0940a73880 Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev am: 0d66f2b854 
am: 24cbf1d542

Change-Id: Ic71e186c3a18799af5666090107d70f037a51c37
 2018-02-13 23:04:02 +00:00
Adam Seaton
04ad5c9520 [automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06 am: 83709d3152 am: 70ea788dfa skipped: ac14372129 am: 83c448128c am: 50abbfdb53 am: 00a67ddab1 am: 2afc690751 skipped: 49f77737a2 am: b0aa7c342a am: a26a50ba69 am: 2d955bd781 
am: 90b42aa3db  -s ours

Change-Id: I7a794b7d11e41d8e73b050f1292d9b6b0df6400b
 2018-02-13 23:00:22 +00:00
Adam Seaton
24cbf1d542 Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into oc-dev 
am: 0d66f2b854

Change-Id: Ia001a0d70252c2b19658e9a29c7e5c4a2a9d9cd7
 2018-02-13 23:00:17 +00:00
TreeHugger Robot
bc76613989 Merge changes from topic "am-ddd6c5a0-3aa8-4d6c-a3b8-0460c103683f" into nyc-mr2-dev 
* changes:
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2
  [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
  [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847
 2018-02-13 22:48:46 +00:00