diff options
| author | Colin Cross <ccross@android.com> | 2020-05-13 11:05:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-05-15 10:13:42 -0700 |
| commit | eb03296b57a414b5c327ae6b4057f279f6903439 (patch) | |
| tree | 5fdf6aa0585e8fde5a4dd13b5cd6112b5463b04b /java/java.go | |
| parent | 0f27063a9e9cd2c9a06920f1aa15b397df68a573 (diff) | |
| download | build_soong-eb03296b57a414b5c327ae6b4057f279f6903439.tar.gz build_soong-eb03296b57a414b5c327ae6b4057f279f6903439.tar.bz2 build_soong-eb03296b57a414b5c327ae6b4057f279f6903439.zip | |
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
Merged-In: I21ba67e8e9fb05016caf5888129adc1a939545c2
(cherry picked from commit c2d24050c5e3a09b7bc5236d15f24afa2405911f)
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 38cde2af..066e09af 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", |