diff options
| author | Ian Rogers <irogers@google.com> | 2014-09-26 23:01:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-26 23:01:45 +0000 |
| commit | 95f03e6a4737f90685fab86e98709f1c4393d5ef (patch) | |
| tree | 9ece0ff7900cdbc526817b287c23a28ca9e08237 | |
| parent | adef736196fb8532d99489206a9c949532fffaca (diff) | |
| parent | b5594ba8a0713ad65413dfabc67ac4cb325383e6 (diff) | |
| download | art-95f03e6a4737f90685fab86e98709f1c4393d5ef.tar.gz art-95f03e6a4737f90685fab86e98709f1c4393d5ef.tar.bz2 art-95f03e6a4737f90685fab86e98709f1c4393d5ef.zip | |
Merge "Fix make test exclusion bugs."
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 7d3665951..1edd543eb 100644 --- a/Android.mk +++ b/Android.mk @@ -25,15 +25,14 @@ art_path := $(LOCAL_PATH) include $(art_path)/build/Android.common_path.mk # Following the example of build's dont_bother for clean targets. -art_done_bother := false +art_dont_bother := false ifneq (,$(filter clean-oat%,$(MAKECMDGOALS))) art_dont_bother := true endif # Don't bother with tests unless there is a test-art* or build-art* target. art_test_bother := false -$(info $(MAKECMDGOALS)) -ifneq (,$(filter test-art% build-art%,$(MAKECMDGOALS))) +ifneq (,$(filter %tests test-art% build-art%,$(MAKECMDGOALS))) art_test_bother := true endif |