From c2d24050c5e3a09b7bc5236d15f24afa2405911f Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 13 May 2020 11:05:02 -0700
Subject: Don't use SDK variant for vendor JNI libraries

Vendor JNI libraries already have stable APIs enforced by the VNDK,
they shouldn't use SDK variants.

Bug: 156225490
Test: TestJNISDK
Change-Id: I21ba67e8e9fb05016caf5888129adc1a939545c2
---
 java/java.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index de38b26e7..17b963f6e 100644
--- a/java/java.go
+++ b/java/java.go
@@ -95,8 +95,7 @@ func (j *Module) CheckStableSdkVersion() error {
 }
 
 func (j *Module) checkSdkVersions(ctx android.ModuleContext) {
-	if j.SocSpecific() || j.DeviceSpecific() ||
-		(j.ProductSpecific() && ctx.Config().EnforceProductPartitionInterface()) {
+	if j.RequiresStableAPIs(ctx) {
 		if sc, ok := ctx.Module().(sdkContext); ok {
 			if !sc.sdkVersion().specified() {
 				ctx.PropertyErrorf("sdk_version",
-- 
cgit v1.2.3-59-g8ed1b