diff options
| author | Colin Cross <ccross@android.com> | 2020-05-15 00:17:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 00:17:18 +0000 |
| commit | 13f9a2ec06641d12cfad6e70af6480746ed3ffcb (patch) | |
| tree | afdf56ab4821c40a48507e2d49fb01af868e8db4 /java/java.go | |
| parent | 5fe323e986374bc243a0d2a52068f8954fb8de8c (diff) | |
| parent | d75524f3228a8679427ebb56df6a3b9a77e2ab71 (diff) | |
Merge "Don't use SDK variant for vendor JNI libraries" am: cb1d161666 am: d75524f322
Change-Id: I5684f17281e31e8d6ffc9d0c7541d55c1bbd0bba
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 01e5f5595..e51c97c96 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", |