From 668b8a21cf749580c8d934a0985586f9cc781d6c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 26 May 2020 18:07:10 +0100 Subject: [PATCH] Remove conditional running of checklast during checkapi Since the metalava invocations have been merged into a single one, and checkapi already requires the other timestamp, this has no effect. Bug: 151160048 Test: m checkapi Change-Id: I560058f0f4cdeaedaf247cd35119da2cf0b86ea0 --- java/androidmk.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/java/androidmk.go b/java/androidmk.go index 6747b30b0..5e3b7d2cb 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -512,14 +512,12 @@ func (ddoc *Droiddoc) AndroidMkEntries() []android.AndroidMkEntries { fmt.Fprintln(w, ddoc.Name()+"-check-last-released-api:", ddoc.checkLastReleasedApiTimestamp.String()) - if ddoc.Name() == "api-stubs-docs" || ddoc.Name() == "system-api-stubs-docs" { - fmt.Fprintln(w, ".PHONY: checkapi") - fmt.Fprintln(w, "checkapi:", - ddoc.checkLastReleasedApiTimestamp.String()) + fmt.Fprintln(w, ".PHONY: checkapi") + fmt.Fprintln(w, "checkapi:", + ddoc.checkLastReleasedApiTimestamp.String()) - fmt.Fprintln(w, ".PHONY: droidcore") - fmt.Fprintln(w, "droidcore: checkapi") - } + fmt.Fprintln(w, ".PHONY: droidcore") + fmt.Fprintln(w, "droidcore: checkapi") } }, },