diff options
| author | 2020-11-23 00:22:30 -0500 | |
|---|---|---|
| committer | 2020-11-23 00:29:18 -0500 | |
| commit | cda22c9bb92a5fc4fa5063103afde34805161c7a (patch) | |
| tree | f7304d81543a6c3319ce32ca71639241dc718ddd /sdk/testing.go | |
| parent | b26070efef296bdd26c9d2ddadd0b4083587c484 (diff) | |
Refactor 'in_make' to mean Kati is not skipped.
In Nougat and before, Make wrote a marker file to indicate that
soong_build was invoked from Make to change certain behaviors of Soong
at build time.
https://cs.android.com/android/platform/superproject/+/android-7.1.2_r36:build/core/soong.mk;l=70-73;drc=ae18638b0406ad107b0882a02a13cdd8b92f2a4e
Things have changed, and now soong_build is invoked from soong_ui, which
supports a --skip-make configuration flag:
https://cs.android.com/android/platform/superproject/+/master:build/soong/ui/build/build.go;l=31-33;drc=680387bf1d3ce7cbc77f535be7c42cec411b1687
Thus, the various remnants of 'EmbeddedInMake' and 'inMake'
configuration are misleading, since soong_build is no longer invoked
from Make. This CL refactors all instances to actually mean that
Kati is enabled (not skipped with --skip-make), and will run after
soong_build finishes, so Kati-specific behavior like the AndroidMk
singleton should run.
Test: TH presubmit
Change-Id: I576ab8e54f99f5c8ddf9feaf9a828019b279e266
Diffstat (limited to 'sdk/testing.go')
| -rw-r--r-- | sdk/testing.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdk/testing.go b/sdk/testing.go index 5f520e5b0..91aa879d0 100644 --- a/sdk/testing.go +++ b/sdk/testing.go @@ -87,7 +87,7 @@ func testSdkContext(bp string, fs map[string][]byte, extraOsTypes []android.OsTy // * Configure that we are inside make // * Add CommonOS to ensure that androidmk processing works. android.RegisterAndroidMkBuildComponents(ctx) - android.SetInMakeForTests(config) + android.SetKatiEnabledForTests(config) config.Targets[android.CommonOS] = []android.Target{ {android.CommonOS, android.Arch{ArchType: android.Common}, android.NativeBridgeDisabled, "", "", true}, } |