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

Merge "Performs same checks as aidl_interface.go before stripping leading "I"." am: 488e7e02a2

Browse Source 
am: 1d0ceef5cf

Change-Id: I0fda0103bbfb0bd9f89c842370375d15fdaf8638
This commit is contained in:
Daniel Norman
2019-09-25 21:23:18 -07:00
committed by android-build-merger
parent 36d00b3f43 1d0ceef5cf
commit e325f660ed
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/gen.go
View File

@@ -113,7 +113,14 @@ func genAidl(ctx android.ModuleContext, rule *android.RuleBuilder, aidlFile andr
aidlPackage := strings.TrimSuffix(aidlFile.Rel(), aidlFile.Base()) aidlPackage := strings.TrimSuffix(aidlFile.Rel(), aidlFile.Base())
baseName := strings.TrimSuffix(aidlFile.Base(), aidlFile.Ext()) baseName := strings.TrimSuffix(aidlFile.Base(), aidlFile.Ext())
shortName := strings.TrimPrefix(baseName, "I") shortName := baseName
// TODO(b/111362593): aidl_to_cpp_common.cpp uses heuristics to figure out if
// an interface name has a leading I. Those same heuristics have been
// moved here.
if len(baseName) >= 2 && baseName[0] == 'I' &&
strings.ToUpper(baseName)[1] == baseName[1] {
shortName = strings.TrimPrefix(baseName, "I")
}
outDir := android.PathForModuleGen(ctx, "aidl") outDir := android.PathForModuleGen(ctx, "aidl")
headerI := outDir.Join(ctx, aidlPackage, baseName+".h") headerI := outDir.Join(ctx, aidlPackage, baseName+".h")