OSDN Git Service

Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.
authorYing Wang <wangying@google.com>
Wed, 28 Oct 2015 19:34:03 +0000 (12:34 -0700)
committerYing Wang <wangying@google.com>
Wed, 4 Nov 2015 01:10:28 +0000 (17:10 -0800)
commit4a4a0bc38f01f67445354543cfae4dafb3e84028
tree7affbbb6cda65b14bbe1bba9db4073ee6a8dcf41
parent29a667598340624f38b0a08c3e9984afc375b12d
Sort out ANDROID_GOALS, KATI_GOALS and NINJA_GOALS.

ANDROID_GOALS: any Android goals that need to be built.
KATI_GOALS: goals that we need to pass to Kati.
NINJA_GOALS: goals we need to pass to Ninja.

For modifier Android goals (dist, INTERNAL_MODIFIER_TARGETS),
we don't need to pass them to Ninja. See also commit
80e46c7c5cb7b1d80114876d301798a8624b4200.
Restore the dist rule removed by the above commit.

Previously "droid" was never passed to Ninja. That's incorrect.
"make droid docs" should build both docs and droiod.
Fixed with this change.

Change-Id: I5c28061fe0ebe7848872ee349056d029b787ff71
core/distdir.mk
core/main.mk
core/ninja.mk