openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes If25be604,I0a310229,I44155630 

* changes:
  Add another jar used by kotlinc
  Actually depend on the headers from renderscript
  Fix a few missing dependencies in APEX building
This commit is contained in:
Treehugger Robot 2019-06-13 17:40:01 +00:00 committed by Gerrit Code Review
parent 1b033f5c4c 1cfbdbe1b2
commit 42d33779cd
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@ -61,7 +61,7 @@ var (
`--key ${key} ${opt_flags} ${image_dir} ${out} `, `--key ${key} ${opt_flags} ${image_dir} ${out} `,
CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}", CommandDeps: []string{"${apexer}", "${avbtool}", "${e2fsdroid}", "${merge_zips}",
"${mke2fs}", "${resize2fs}", "${sefcontext_compile}", "${mke2fs}", "${resize2fs}", "${sefcontext_compile}",
"${soong_zip}", "${zipalign}", "${aapt2}"}, "${soong_zip}", "${zipalign}", "${aapt2}", "prebuilts/sdk/current/public/android.jar"},
Description: "APEX ${image_dir} => ${out}", Description: "APEX ${image_dir} => ${out}",
}, "tool_path", "image_dir", "copy_commands", "manifest", "file_contexts", "canned_fs_config", "key", "opt_flags") }, "tool_path", "image_dir", "copy_commands", "manifest", "file_contexts", "canned_fs_config", "key", "opt_flags")
@ -1062,6 +1062,10 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap
Description: "signapk", Description: "signapk",
Output: a.outputFiles[apexType], Output: a.outputFiles[apexType],
Input: unsignedOutputFile, Input: unsignedOutputFile,
Implicits: []android.Path{
a.container_certificate_file,
a.container_private_key_file,
},
Args: map[string]string{ Args: map[string]string{
"certificates": a.container_certificate_file.String() + " " + a.container_private_key_file.String(), "certificates": a.container_certificate_file.String() + " " + a.container_private_key_file.String(),
"flags": "-a 4096", //alignment "flags": "-a 4096", //alignment

9
cc/rs.go
View File

@ -72,11 +72,12 @@ func rsGenerateCpp(ctx android.ModuleContext, rsFiles android.Paths, rsFlags str
stampFile := android.PathForModuleGen(ctx, "rs", "rs.stamp") stampFile := android.PathForModuleGen(ctx, "rs", "rs.stamp")
depFiles := make(android.WritablePaths, 0, len(rsFiles)) depFiles := make(android.WritablePaths, 0, len(rsFiles))
genFiles := make(android.WritablePaths, 0, 2*len(rsFiles)) genFiles := make(android.WritablePaths, 0, 2*len(rsFiles))
headers := make(android.Paths, 0, len(rsFiles))
for _, rsFile := range rsFiles { for _, rsFile := range rsFiles {
depFiles = append(depFiles, rsGeneratedDepFile(ctx, rsFile)) depFiles = append(depFiles, rsGeneratedDepFile(ctx, rsFile))
genFiles = append(genFiles, headerFile := rsGeneratedHFile(ctx, rsFile)
rsGeneratedCppFile(ctx, rsFile), genFiles = append(genFiles, rsGeneratedCppFile(ctx, rsFile), headerFile)
rsGeneratedHFile(ctx, rsFile)) headers = append(headers, headerFile)
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
@ -92,7 +93,7 @@ func rsGenerateCpp(ctx android.ModuleContext, rsFiles android.Paths, rsFlags str
}, },
}) })
return android.Paths{stampFile} return headers
} }
func rsFlags(ctx ModuleContext, flags Flags, properties *BaseCompilerProperties) Flags { func rsFlags(ctx ModuleContext, flags Flags, properties *BaseCompilerProperties) Flags {

1
java/config/kotlin.go
View File

@ -32,6 +32,7 @@ func init() {
pctx.SourcePathVariable("KotlinScriptRuntimeJar", "external/kotlinc/lib/kotlin-script-runtime.jar") pctx.SourcePathVariable("KotlinScriptRuntimeJar", "external/kotlinc/lib/kotlin-script-runtime.jar")
pctx.SourcePathVariable("KotlinTrove4jJar", "external/kotlinc/lib/trove4j.jar") pctx.SourcePathVariable("KotlinTrove4jJar", "external/kotlinc/lib/trove4j.jar")
pctx.SourcePathVariable("KotlinKaptJar", "external/kotlinc/lib/kotlin-annotation-processing.jar") pctx.SourcePathVariable("KotlinKaptJar", "external/kotlinc/lib/kotlin-annotation-processing.jar")
pctx.SourcePathVariable("KotlinAnnotationJar", "external/kotlinc/lib/annotations-13.0.jar")
pctx.SourcePathVariable("KotlinStdlibJar", KotlinStdlibJar) pctx.SourcePathVariable("KotlinStdlibJar", KotlinStdlibJar)
// These flags silence "Illegal reflective access" warnings when running kotlinc in OpenJDK9 // These flags silence "Illegal reflective access" warnings when running kotlinc in OpenJDK9

1
java/kotlin.go
View File

@ -44,6 +44,7 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc",
"${config.KotlinScriptRuntimeJar}", "${config.KotlinScriptRuntimeJar}",
"${config.KotlinStdlibJar}", "${config.KotlinStdlibJar}",
"${config.KotlinTrove4jJar}", "${config.KotlinTrove4jJar}",
"${config.KotlinAnnotationJar}",
"${config.GenKotlinBuildFileCmd}", "${config.GenKotlinBuildFileCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",