Fix m ndk.

Apparently treehugger doesn't cover this, and autosubmit fired before
I had a chance to upload the second PS.

Bug: None
Test: m ndk
Change-Id: I292f7349b98d5f9132ea41729933c1462e100a69

cc/ndk_library.go

@@ -429,12 +429,15 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
 	// Also ensure that the ABI of the next API level (if there is one) matches
 	// this API level. *New* ABI is allowed, but any changes to APIs that exist
 	// in this API level are disallowed.
-	if !this.apiLevel.IsCurrent() && prebuiltAbiDump.Valid() {
+	if prebuiltAbiDump.Valid() {
 		nextApiLevel := findNextApiLevel(ctx, this.apiLevel)
 		if nextApiLevel == nil {
 			panic(fmt.Errorf("could not determine which API level follows "+
 				"non-current API level %s", this.apiLevel))
 		}
+
+		// "current" ABI is not tracked.
+		if !nextApiLevel.IsCurrent() {
 			nextAbiDiffPath := android.PathForModuleOut(ctx,
 				"abidiff_next.timestamp")
 			nextAbiDump := this.findPrebuiltAbiDump(ctx, *nextApiLevel)
@@ -465,6 +468,7 @@ func (this *stubDecorator) diffAbi(ctx ModuleContext) {
 			}
 			this.abiDiffPaths = append(this.abiDiffPaths, nextAbiDiffPath)
 		}
+	}
 }
 
 func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) Objects {