The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/376a7301c58f9dca728193c36ad887dabd0631c3

commit 376a7301c58f9dca728193c36ad887dabd0631c3
Author: Sam McNally <sammc@chromium.org>
Date: Thu Mar 15 22:27:17 2018

common-mk: Don't include sources in inputs for generating dbus bindings.

Tip-of-tree GYP doesn't allow ${source} to end up in the inputs list.
generate-dbus-adaptors.gypi and generate-dbus-proxies.gypi supply the
sources as inputs, which are translated into ${source} at ninja
generation time, causing assert failures with ToT GYP. Providing these
as inputs does not appear to be necessary, and other generator .gypi
files do not, so remove them to allow ToT GYP to be used.

BUG= chromium:821283 
TEST=Built cros-disks, cryptohome and permission_broker
TEST=Check incremental rebuild triggers when modifying dbus sources:
Build cryptohome with ninja
touch cryptohome/dbus_adaptors/org.chromium.BootLockboxInterface.xml
rerun ninja and the dbus bindings are regenerated
Change-Id: Ibac6debe8d281fe93837e4339411c5ff0169d348
Reviewed-on: https://chromium-review.googlesource.com/959844
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/376a7301c58f9dca728193c36ad887dabd0631c3/common-mk/generate-dbus-proxies.gypi
[modify] https://crrev.com/376a7301c58f9dca728193c36ad887dabd0631c3/common-mk/generate-dbus-adaptors.gypi

The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/update_engine/+/89afe86b007d21d11f3d4b6e139d300b411d2e17

commit 89afe86b007d21d11f3d4b6e139d300b411d2e17
Author: Sam McNally <sammc@chromium.org>
Date: Fri Mar 23 15:46:17 2018

update_engine: Remove 'inputs' from tar_bunzip2.gypi.

Tip-of-tree GYP doesn't allow ${source} to end up in the inputs list.
tar_bunzip2.gypi supplies the source as inputs, which translates into
${source} at ninja generation time, causing assert failures with ToT
GYP. Providing these as inputs does not appear to be necessary, and
other generator .gypi files do not, so remove them to allow ToT GYP to
be used.

BUG= chromium:821283 
TEST=touch sample_images/sample_images.tar.bz2
rerun ninja and sample_images/sample_images.tar.bz2 is extracted again
Change-Id: I12b2f4a98c3792cae65771d5719b639202e23ca7
Reviewed-on: https://chromium-review.googlesource.com/970002
Commit-Ready: Sam McNally <sammc@chromium.org>
Tested-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>

[modify] https://crrev.com/89afe86b007d21d11f3d4b6e139d300b411d2e17/tar_bunzip2.gypi

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/platform2/+/9ded3858e9b3edbaf0cc6f95a6951fa5ea9f9666

commit 9ded3858e9b3edbaf0cc6f95a6951fa5ea9f9666
Author: Sam McNally <sammc@chromium.org>
Date: Sat Mar 24 12:12:27 2018

common-mk: Strip {C,CXX,CPP,LD}FLAGS environment variables for GYP.

ToT GYP appends {C,CXX,CPP,LD}FLAGS environment variables to the
corresponding ninja variables when generating ninja files. Unlike the
existing mechanism for forwarding environment-provided flags
(external_{c,cxx,cpp,ld}flags GYP variables), these are not modifiable
by .gyp(i) files. This causes problems when -fno-exceptions is passed in
the environment, but is intended to be removed by a target that does
require exceptions.

Remove CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS from the environment used
to run GYP to avoid impossible-to-remove flags.

BUG= chromium:821283 
TEST=FEATURES=test emerge-eve cromo and wimax_manager

Change-Id: Icd908e6f2057db3a935871e8ffd4567815297dcd
Reviewed-on: https://chromium-review.googlesource.com/979312
Commit-Ready: Sam McNally <sammc@chromium.org>
Tested-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[modify] https://crrev.com/9ded3858e9b3edbaf0cc6f95a6951fa5ea9f9666/common-mk/platform2.py

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/160c89a40dcf8ff0cdeb04b4687582c60220f86e

commit 160c89a40dcf8ff0cdeb04b4687582c60220f86e
Author: Sam McNally <sammc@chromium.org>
Date: Sun Mar 25 01:44:17 2018

Roll gyp to upstream master.

Add a local patch to revert a change that disabled symlink resolution
when determining where to write .ninja files, causing cros_workon_make
to fail.

BUG= chromium:821283 
TEST=Built cros-disks, cryptohome and permission_broker
CQ-DEPEND=CL:959844
Change-Id: I1ed64aff5c928e0382e9b843fa867988700d0519
Reviewed-on: https://chromium-review.googlesource.com/958792
Commit-Ready: Sam McNally <sammc@chromium.org>
Tested-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

[add] https://crrev.com/160c89a40dcf8ff0cdeb04b4687582c60220f86e/dev-util/gyp/gyp-2018.02.07.213755.ebuild
[delete] https://crrev.com/66f8ee3481f9d3cc9597d5a3751d9ac9a48497cb/dev-util/gyp/gyp-1590.ebuild
[modify] https://crrev.com/160c89a40dcf8ff0cdeb04b4687582c60220f86e/dev-util/gyp/Manifest
[add] https://crrev.com/160c89a40dcf8ff0cdeb04b4687582c60220f86e/dev-util/gyp/files/gyp-2018.02.07.213755-ninja-symlink-fix.patch
[delete] https://crrev.com/66f8ee3481f9d3cc9597d5a3751d9ac9a48497cb/dev-util/gyp/files/gyp-1590-Avoid-gypd-infinite-recursion.patch
[rename] https://crrev.com/160c89a40dcf8ff0cdeb04b4687582c60220f86e/dev-util/gyp/files/gyp-2018.02.07.213755-shlex-split-fix.patch
[delete] https://crrev.com/66f8ee3481f9d3cc9597d5a3751d9ac9a48497cb/dev-util/gyp/gyp-1590-r4.ebuild