StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add previous_api property to java_api_library module" into main am: 9a3cd19bee am: 7bdc85175f am: 706d31cb27 am: 83ca3ce0ec

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2685826

Change-Id: I28f95330ce75165432604ad87c93dba884e8f9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2023-08-14 22:34:01 +00:00
committed by Automerger Merge Worker
parent b1afd13767 83ca3ce0ec
commit e31d2662fd
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java.go
View File

@@ -1683,6 +1683,9 @@ type JavaApiLibraryProperties struct {
// extracting the compiled class files provided by the
// full_api_surface_stub module.
Full_api_surface_stub *string
// Version of previously released API file for compatibility check.
Previous_api *string `android:"path"`
}
func ApiLibraryFactory() android.Module {
@@ -1890,6 +1893,12 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
al.stubsFlags(ctx, cmd, stubsDir)
migratingNullability := String(al.properties.Previous_api) != ""
if migratingNullability {
previousApi := android.PathForModuleSrc(ctx, String(al.properties.Previous_api))
cmd.FlagWithInput("--migrate-nullness ", previousApi)
}
al.stubsSrcJar = android.PathForModuleOut(ctx, "metalava", ctx.ModuleName()+"-"+"stubs.srcjar")
al.stubsJarWithoutStaticLibs = android.PathForModuleOut(ctx, "metalava", "stubs.jar")
al.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName(), fmt.Sprintf("%s.jar", ctx.ModuleName()))