From ca70fc40bd5d7bf3b24c25de0a06c2a6df17f7ea Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 1 Mar 2023 23:38:49 +0000 Subject: Update target_sdk_version from SdkSpec to ApiLevel target_sdk_version signifies device version and does not need an sdkKind to describe it fully. Update the type and cleanup existing usages. As a side benefit, we also get better error handling since users can no longer enter something like `public_30` as a valid target_sdk_version in bp files Test: m nothing Test: no change in ninja files (this should be a no-op) Bug: 208456999 Change-Id: I3c19245e29184bd9e5660ad8981966f64dfa9424 --- java/java.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 287bdace3..2a7e4e1bf 100644 --- a/java/java.go +++ b/java/java.go @@ -1905,8 +1905,8 @@ func (j *Import) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) return android.SdkSpecFrom(ctx, "") } -func (j *Import) TargetSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { - return j.SdkVersion(ctx) +func (j *Import) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { + return j.SdkVersion(ctx).ApiLevel } func (j *Import) Prebuilt() *android.Prebuilt { -- cgit v1.2.3-59-g8ed1b