tree 87d1eedfccc80dc20957a4910e047b326b67d200
parent 4a825c7450b2b16f2c55b533065d95a0ea08b6b9
author Colin Cross <ccross@android.com> 1490911384 -0700
committer Colin Cross <ccross@android.com> 1490921333 +0000

Fix include order

Include order should be module includes, dependency exported includes,
and then global includes.  Module includes and global includes are
computed during compileFlags, but dependency exported includes are
not handled until later.  Move the global includes into a new
flags variable so that the dependency includes can be appended
to the module includes.

Test: m -j native
Change-Id: Ifc3894f0a898a070d6da8eed4f4b9e8cc0cd2523