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 I2bff8fb8,Ifa584479 am: cb4e0551a2 

am: 787b999bc0

Change-Id: Idbc987afbaf1fcc183629431a745c9ae41bb215f
This commit is contained in:
Dan Willemsen 2019-04-09 18:26:03 -07:00 committed by android-build-merger
parent 0f76b38802 787b999bc0
commit 868e299039
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/variable.go
View File

@ -303,9 +303,15 @@ func stringPtr(v string) *string {
func (v *productVariables) SetDefaultConfig() { func (v *productVariables) SetDefaultConfig() {
*v = productVariables{ *v = productVariables{
Platform_sdk_version: intPtr(26), BuildNumberFromFile: stringPtr("123456789"),
Platform_version_active_codenames: []string{"P"},
Platform_version_future_codenames: []string{"P"}, Platform_version_name: stringPtr("Q"),
Platform_sdk_version: intPtr(28),
Platform_sdk_codename: stringPtr("Q"),
Platform_sdk_final: boolPtr(false),
Platform_version_active_codenames: []string{"Q"},
Platform_version_future_codenames: []string{"Q"},
Platform_vndk_version: stringPtr("Q"),
HostArch: stringPtr("x86_64"), HostArch: stringPtr("x86_64"),
HostSecondaryArch: stringPtr("x86"), HostSecondaryArch: stringPtr("x86"),

4
java/config/kotlin.go
View File

@ -27,6 +27,10 @@ var (
func init() { func init() {
pctx.SourcePathVariable("KotlincCmd", "external/kotlinc/bin/kotlinc") pctx.SourcePathVariable("KotlincCmd", "external/kotlinc/bin/kotlinc")
pctx.SourcePathVariable("KotlinCompilerJar", "external/kotlinc/lib/kotlin-compiler.jar") pctx.SourcePathVariable("KotlinCompilerJar", "external/kotlinc/lib/kotlin-compiler.jar")
pctx.SourcePathVariable("KotlinPreloaderJar", "external/kotlinc/lib/kotlin-preloader.jar")
pctx.SourcePathVariable("KotlinReflectJar", "external/kotlinc/lib/kotlin-reflect.jar")
pctx.SourcePathVariable("KotlinScriptRuntimeJar", "external/kotlinc/lib/kotlin-script-runtime.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("KotlinStdlibJar", KotlinStdlibJar) pctx.SourcePathVariable("KotlinStdlibJar", KotlinStdlibJar)

9
java/gen.go
View File

@ -23,8 +23,9 @@ import (
func init() { func init() {
pctx.HostBinToolVariable("aidlCmd", "aidl") pctx.HostBinToolVariable("aidlCmd", "aidl")
pctx.HostBinToolVariable("syspropCmd", "sysprop_java") pctx.HostBinToolVariable("syspropCmd", "sysprop_java")
pctx.SourcePathVariable("logtagsCmd", "build/tools/java-event-log-tags.py") pctx.SourcePathVariable("logtagsCmd", "build/make/tools/java-event-log-tags.py")
pctx.SourcePathVariable("mergeLogtagsCmd", "build/tools/merge-event-log-tags.py") pctx.SourcePathVariable("mergeLogtagsCmd", "build/make/tools/merge-event-log-tags.py")
pctx.SourcePathVariable("logtagsLib", "build/make/tools/event_log_tags.py")
} }
var ( var (
@ -38,13 +39,13 @@ var (
logtags = pctx.AndroidStaticRule("logtags", logtags = pctx.AndroidStaticRule("logtags",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$logtagsCmd -o $out $in", Command: "$logtagsCmd -o $out $in",
CommandDeps: []string{"$logtagsCmd"}, CommandDeps: []string{"$logtagsCmd", "$logtagsLib"},
}) })
mergeLogtags = pctx.AndroidStaticRule("mergeLogtags", mergeLogtags = pctx.AndroidStaticRule("mergeLogtags",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "$mergeLogtagsCmd -o $out $in", Command: "$mergeLogtagsCmd -o $out $in",
CommandDeps: []string{"$mergeLogtagsCmd"}, CommandDeps: []string{"$mergeLogtagsCmd", "$logtagsLib"},
}) })
sysprop = pctx.AndroidStaticRule("sysprop", sysprop = pctx.AndroidStaticRule("sysprop",

5
java/kotlin.go
View File

@ -37,6 +37,11 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc",
CommandDeps: []string{ CommandDeps: []string{
"${config.KotlincCmd}", "${config.KotlincCmd}",
"${config.KotlinCompilerJar}", "${config.KotlinCompilerJar}",
"${config.KotlinPreloaderJar}",
"${config.KotlinReflectJar}",
"${config.KotlinScriptRuntimeJar}",
"${config.KotlinStdlibJar}",
"${config.KotlinTrove4jJar}",
"${config.GenKotlinBuildFileCmd}", "${config.GenKotlinBuildFileCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
"${config.ZipSyncCmd}", "${config.ZipSyncCmd}",