Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
  Revert "install_symlink: Make symlink target configurable"
  Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
  Revert "rust: config: Fix missing CPU variant LD flags in Rust"
  Rename build-flag in outdir
  Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
  Convert check-vintf-all to phony with actions
  Create a partial implementation of check-vintf-all for soong-only
  Configure RBE rust pool based on build variant
  Revert^3 "Add sdk version check to arr"
  Add jdk.internal.invoke to the allowlist
  Make droid always depend on symbols zip
  Import Device and Odm skus
  Don't install gob_gen in Soong
  Remove bazel reference from run_integration_tests.sh
  Fix bootstrap_test.sh
  Don't panic in aconfig libraries when AllowMissingDependencies is set
  Avoid returning nil paths from PathForModuleSrc
  Revert "Flag controled clang version"
  Rework module target dependencies on required deps
  Revert^2 "Add sdk version check to arr"
  ...

Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de

1 files changed, 44 insertions, 23 deletions

diff --git a/android/config_test.go b/android/config_test.go
index 81b7c3eb5..681f9e71b 100644
--- a/android/config_test.go
+++ b/android/config_test.go
@@ -218,13 +218,23 @@ func (p partialCompileFlags) updateUseD8(value bool) partialCompileFlags {
 	return p
 }
 
-func (p partialCompileFlags) updateDisableApiLint(value bool) partialCompileFlags {
-	p.Disable_api_lint = value
+func (p partialCompileFlags) updateDisableStubValidation(value bool) partialCompileFlags {
+	p.Disable_stub_validation = value
 	return p
 }
 
-func (p partialCompileFlags) updateDisableStubValidation(value bool) partialCompileFlags {
-	p.Disable_stub_validation = value
+func (p partialCompileFlags) updateEnableIncJavac(value bool) partialCompileFlags {
+	p.Enable_inc_javac = value
+	return p
+}
+
+func (p partialCompileFlags) updateEnableIncKotlin(value bool) partialCompileFlags {
+	p.Enable_inc_kotlin = value
+	return p
+}
+
+func (p partialCompileFlags) updateEnableIncD8(value bool) partialCompileFlags {
+	p.Enable_inc_d8 = value
 	return p
 }
 
@@ -246,7 +256,7 @@ func TestPartialCompile(t *testing.T) {
 		{"false", true, partialCompileFlags{}},
 		{"true", true, enabledPartialCompileFlags},
 		{"true", false, partialCompileFlags{}},
-		{"all", true, partialCompileFlags{}.updateUseD8(true).updateDisableApiLint(true).updateDisableStubValidation(true)},
+		{"all", true, partialCompileFlags{}.updateUseD8(true).updateDisableStubValidation(true).updateEnableIncJavac(true).updateEnableIncKotlin(false).updateEnableIncD8(true)},
 
 		// This verifies both use_d8 and the processing order.
 		{"true,use_d8", true, enabledPartialCompileFlags.updateUseD8(true)},
@@ -254,14 +264,6 @@ func TestPartialCompile(t *testing.T) {
 		{"use_d8,false", true, partialCompileFlags{}},
 		{"false,+use_d8", true, partialCompileFlags{}.updateUseD8(true)},
 
-		// disable_api_lint can be specified with any of 3 options.
-		{"false,-api_lint", true, partialCompileFlags{}.updateDisableApiLint(true)},
-		{"false,-enable_api_lint", true, partialCompileFlags{}.updateDisableApiLint(true)},
-		{"false,+disable_api_lint", true, partialCompileFlags{}.updateDisableApiLint(true)},
-		{"false,+api_lint", true, partialCompileFlags{}.updateDisableApiLint(false)},
-		{"false,+enable_api_lint", true, partialCompileFlags{}.updateDisableApiLint(false)},
-		{"false,-disable_api_lint", true, partialCompileFlags{}.updateDisableApiLint(false)},
-
 		// disable_stub_validation can be specified with any of 3 options.
 		{"false,-stub_validation", true, partialCompileFlags{}.updateDisableStubValidation(true)},
 		{"false,-enable_stub_validation", true, partialCompileFlags{}.updateDisableStubValidation(true)},
@@ -269,6 +271,30 @@ func TestPartialCompile(t *testing.T) {
 		{"false,+stub_validation", true, partialCompileFlags{}.updateDisableStubValidation(false)},
 		{"false,+enable_stub_validation", true, partialCompileFlags{}.updateDisableStubValidation(false)},
 		{"false,-disable_stub_validation", true, partialCompileFlags{}.updateDisableStubValidation(false)},
+
+		// enable_inc_javac can be specified with any of 3 options.
+		{"false,-inc_javac", true, partialCompileFlags{}.updateEnableIncJavac(false)},
+		{"false,-enable_inc_javac", true, partialCompileFlags{}.updateEnableIncJavac(false)},
+		{"false,+disable_inc_javac", true, partialCompileFlags{}.updateEnableIncJavac(false)},
+		{"false,+inc_javac", true, partialCompileFlags{}.updateEnableIncJavac(true)},
+		{"false,+enable_inc_javac", true, partialCompileFlags{}.updateEnableIncJavac(true)},
+		{"false,-disable_inc_javac", true, partialCompileFlags{}.updateEnableIncJavac(true)},
+
+		// enable_inc_kotlin can be specified with any of 3 options.
+		{"false,-inc_kotlin", true, partialCompileFlags{}.updateEnableIncKotlin(false)},
+		{"false,-enable_inc_kotlin", true, partialCompileFlags{}.updateEnableIncKotlin(false)},
+		{"false,+disable_inc_kotlin", true, partialCompileFlags{}.updateEnableIncKotlin(false)},
+		{"false,+inc_kotlin", true, partialCompileFlags{}.updateEnableIncKotlin(true)},
+		{"false,+enable_inc_kotlin", true, partialCompileFlags{}.updateEnableIncKotlin(true)},
+		{"false,-disable_inc_kotlin", true, partialCompileFlags{}.updateEnableIncKotlin(true)},
+
+		// enable_inc_d8 can be specified with any of 3 options.
+		{"false,-inc_d8", true, partialCompileFlags{}.updateEnableIncD8(false)},
+		{"false,-enable_inc_d8", true, partialCompileFlags{}.updateEnableIncD8(false)},
+		{"false,+disable_inc_d8", true, partialCompileFlags{}.updateEnableIncD8(false)},
+		{"false,+inc_d8", true, partialCompileFlags{}.updateEnableIncD8(true)},
+		{"false,+enable_inc_d8", true, partialCompileFlags{}.updateEnableIncD8(true)},
+		{"false,-disable_inc_d8", true, partialCompileFlags{}.updateEnableIncD8(true)},
 	}
 
 	for _, test := range tests {
@@ -292,23 +318,18 @@ type configTestModule struct {
 }
 
 func (d *configTestModule) GenerateAndroidBuildActions(ctx ModuleContext) {
-	deviceName := ctx.Config().DeviceName()
 	if ctx.ModuleName() == "foo" {
 		if ctx.Module().UseGenericConfig() {
-			ctx.PropertyErrorf("use_generic_config", "must not be set for this test")
+			ctx.ModuleErrorf("must not use generic config")
 		}
 	} else if ctx.ModuleName() == "bar" {
 		if !ctx.Module().UseGenericConfig() {
-			ctx.ModuleErrorf("\"use_generic_config: true\" must be set for this test")
+			ctx.ModuleErrorf("must use generic config")
 		}
 	}
 
-	if ctx.Module().UseGenericConfig() {
-		if deviceName != "generic" {
-			ctx.ModuleErrorf("Device name for this module must be \"generic\" but %q\n", deviceName)
-		}
-	} else {
-		if deviceName == "generic" {
+	if !ctx.Module().UseGenericConfig() {
+		if ctx.Config().DeviceName() == "generic" {
 			ctx.ModuleErrorf("Device name for this module must not be \"generic\"\n")
 		}
 	}
@@ -331,11 +352,11 @@ func TestGenericConfig(t *testing.T) {
 	bp := `
 		test {
 			name: "foo",
+			vendor: true,
 		}
 
 		test {
 			name: "bar",
-			use_generic_config: true,
 		}
 	`