Skip to content
Commit 20eab856 authored by Jeff Gaston's avatar Jeff Gaston
Browse files

Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Make ninja file deterministic even with dup module names
  Disallow bp 'build' includes to reference other dirs
  Pass ModulePath to NameInterface
  Have handleOneFile(child) wait for handleOneFile(parent).

Bug: 65683273
Test: see individual tests on the merged commits

Change-Id: Ifeb0b67f21d0ab90172a9a79ccebbef52d64f258
parents 058a24de 14978f8f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment