diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 3 | ||||
| -rw-r--r-- | java/gen.go | 31 | ||||
| -rw-r--r-- | java/java.go | 5 |
3 files changed, 31 insertions, 8 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index b47494893..118b62c21 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -485,9 +485,6 @@ func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths, case ".aidl": javaFile := genAidl(ctx, srcFile, flags.aidlFlags, flags.aidlDeps) outSrcFiles = append(outSrcFiles, javaFile) - case ".sysprop": - javaFile := genSysprop(ctx, srcFile) - outSrcFiles = append(outSrcFiles, javaFile) case ".logtags": javaFile := genLogtags(ctx, srcFile) outSrcFiles = append(outSrcFiles, javaFile) diff --git a/java/gen.go b/java/gen.go index 69965ecec..81fc3417f 100644 --- a/java/gen.go +++ b/java/gen.go @@ -53,13 +53,13 @@ var ( sysprop = pctx.AndroidStaticRule("sysprop", blueprint.RuleParams{ Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` + - `$syspropCmd --java-output-dir $out.tmp $in && ` + + `$syspropCmd --scope $scope --java-output-dir $out.tmp $in && ` + `${config.SoongZipCmd} -jar -o $out -C $out.tmp -D $out.tmp && rm -rf $out.tmp`, CommandDeps: []string{ "$syspropCmd", "${config.SoongZipCmd}", }, - }) + }, "scope") ) func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string, deps android.Paths) android.Path { @@ -98,7 +98,7 @@ func genLogtags(ctx android.ModuleContext, logtagsFile android.Path) android.Pat return javaFile } -func genSysprop(ctx android.ModuleContext, syspropFile android.Path) android.Path { +func genSysprop(ctx android.ModuleContext, syspropFile android.Path, scope string) android.Path { srcJarFile := android.GenPathWithExt(ctx, "sysprop", syspropFile, "srcjar") ctx.Build(pctx, android.BuildParams{ @@ -106,6 +106,9 @@ func genSysprop(ctx android.ModuleContext, syspropFile android.Path) android.Pat Description: "sysprop_java " + syspropFile.Rel(), Output: srcJarFile, Input: syspropFile, + Args: map[string]string{ + "scope": scope, + }, }) return srcJarFile @@ -129,7 +132,27 @@ func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths, srcJarFile := genProto(ctx, srcFile, flags.proto) outSrcFiles = append(outSrcFiles, srcJarFile) case ".sysprop": - srcJarFile := genSysprop(ctx, srcFile) + // internal scope contains all properties + // public scope only contains public properties + // use public if the owner is different from client + scope := "internal" + if j.properties.Sysprop.Platform != nil { + isProduct := ctx.ProductSpecific() + isVendor := ctx.SocSpecific() + isOwnerPlatform := Bool(j.properties.Sysprop.Platform) + + if isProduct { + // product can't own any sysprop_library now, so product must use public scope + scope = "public" + } else if isVendor && !isOwnerPlatform { + // vendor and odm can't use system's internal property. + scope = "public" + } + + // We don't care about clients under system. + // They can't use sysprop_library owned by other partitions. + } + srcJarFile := genSysprop(ctx, srcFile, scope) outSrcFiles = append(outSrcFiles, srcJarFile) default: outSrcFiles = append(outSrcFiles, srcFile) diff --git a/java/java.go b/java/java.go index afb121871..2193a2bd7 100644 --- a/java/java.go +++ b/java/java.go @@ -183,6 +183,10 @@ type CompilerProperties struct { Output_params []string } + Sysprop struct { + Platform *bool + } `blueprint:"mutated"` + Instrument bool `blueprint:"mutated"` // List of files to include in the META-INF/services folder of the resulting jar. @@ -1017,7 +1021,6 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB } func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { - j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.deviceProperties.Aidl.Export_include_dirs) deps := j.collectDeps(ctx) |