Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb4e0551 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I2bff8fb8,Ifa584479 

* changes:
  Add extra used dependencies
  Update default soong config
parents 25e6f09c aad19605

android/variable.go

+9 −3
Original line number Diff line number Diff line
@@ -303,9 +303,15 @@ func stringPtr(v string) *string { 


func (v *productVariables) SetDefaultConfig() {

	*v = productVariables{

		Platform_sdk_version:              intPtr(26),

		Platform_version_active_codenames: []string{"P"},

		Platform_version_future_codenames: []string{"P"},

		BuildNumberFromFile: stringPtr("123456789"),



		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"),

		HostSecondaryArch:          stringPtr("x86"),

java/config/kotlin.go

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ var ( 
func init() {

	pctx.SourcePathVariable("KotlincCmd", "external/kotlinc/bin/kotlinc")

	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("KotlinStdlibJar", KotlinStdlibJar)

java/gen.go

+5 −4
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ import ( 
func init() {

	pctx.HostBinToolVariable("aidlCmd", "aidl")

	pctx.HostBinToolVariable("syspropCmd", "sysprop_java")

	pctx.SourcePathVariable("logtagsCmd", "build/tools/java-event-log-tags.py")

	pctx.SourcePathVariable("mergeLogtagsCmd", "build/tools/merge-event-log-tags.py")

	pctx.SourcePathVariable("logtagsCmd", "build/make/tools/java-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 (
@@ -38,13 +39,13 @@ var ( 
	logtags = pctx.AndroidStaticRule("logtags",

		blueprint.RuleParams{

			Command:     "$logtagsCmd -o $out $in",

			CommandDeps: []string{"$logtagsCmd"},

			CommandDeps: []string{"$logtagsCmd", "$logtagsLib"},

		})



	mergeLogtags = pctx.AndroidStaticRule("mergeLogtags",

		blueprint.RuleParams{

			Command:     "$mergeLogtagsCmd -o $out $in",

			CommandDeps: []string{"$mergeLogtagsCmd"},

			CommandDeps: []string{"$mergeLogtagsCmd", "$logtagsLib"},

		})



	sysprop = pctx.AndroidStaticRule("sysprop",

java/kotlin.go

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ var kotlinc = pctx.AndroidGomaStaticRule("kotlinc", 
		CommandDeps: []string{

			"${config.KotlincCmd}",

			"${config.KotlinCompilerJar}",

			"${config.KotlinPreloaderJar}",

			"${config.KotlinReflectJar}",

			"${config.KotlinScriptRuntimeJar}",

			"${config.KotlinStdlibJar}",

			"${config.KotlinTrove4jJar}",

			"${config.GenKotlinBuildFileCmd}",

			"${config.SoongZipCmd}",

			"${config.ZipSyncCmd}",