diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-23 01:10:14 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-23 01:10:14 +0000 |
| commit | 531d1c8cf3ad1c94cf10b2db3524e24f1080c6b1 (patch) | |
| tree | d6f9e0db093f3139ddd1283498a59732234733e4 | |
| parent | 185dc0d4084341aa5b1dbf387cfd6b86d81dbabb (diff) | |
| parent | 2a9f92effde9d32de523a3ebfe8431595ae06f86 (diff) | |
| download | aidl-531d1c8cf3ad1c94cf10b2db3524e24f1080c6b1.tar.gz | |
Snap for 8340624 from 2a9f92effde9d32de523a3ebfe8431595ae06f86 to tm-release
Change-Id: Ib6ebd3ed49da9062bab49debd6edfbd72537f77e
| -rw-r--r-- | build/aidl_api.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/aidl_api.go b/build/aidl_api.go index 15a50d0d..1fc4474f 100644 --- a/build/aidl_api.go +++ b/build/aidl_api.go @@ -242,7 +242,7 @@ func (m *aidlApi) migrateAndAppendVersion(ctx android.ModuleContext, rb *android rbc.Text("\"" + im + "-V'" + `$(if [ "$(cat `). Input(importApis[im].hasDevelopment). Text(`)" = "1" ]; then echo "` + importIfaces[im].nextVersion() + - `"; else echo "` + importIfaces[im].latestVersion() + `"; fi)'"`) + `"; else echo "` + importIfaces[im].latestVersion() + `"; fi)'", `) } } rbc.Text("]}' "). @@ -256,7 +256,8 @@ func (m *aidlApi) migrateAndAppendVersion(ctx android.ModuleContext, rb *android imports = append(imports, im+"-V"+importIfaces[im].latestVersion()) } } - data := fmt.Sprintf(`{version: "%s", imports: %v}`, v, wrap(`"`, imports, `"`)) + importsStr := strings.Join(wrap(`"`, imports, `"`), ", ") + data := fmt.Sprintf(`{version: "%s", imports: [%s]}`, v, importsStr) // Also modify Android.bp file to add the new version to the 'versions_with_info' property. wrapWithDiffCheckIf(m, rb, func(rbc *android.RuleBuilderCommand) { |