Separate snapshot definition

Current snapshot definition is located in the CC module, so it is
difficult to capture non-CC module (such as prebuilt_etc) to the
snapshot. Separate general snapshot definition from cc so other modules
can also define its own snapshot.

Bug: 192430376
Test: m nothing passed
Change-Id: Ifb69fb3d2ec555b629aa31ec03e7ce5831fd3063
This commit is contained in:
Kiyoung Kim
2021-07-07 12:42:39 +09:00
parent 393bffee78
commit 48f3778cb4
18 changed files with 643 additions and 427 deletions

View File

@@ -21,6 +21,7 @@ import (
"android/soong/android"
"android/soong/cc"
"android/soong/snapshot"
)
var (
@@ -639,7 +640,7 @@ func LibraryMutator(mctx android.BottomUpMutatorContext) {
variation := v.(*Module).ModuleBase.ImageVariation().Variation
if strings.HasPrefix(variation, cc.VendorVariationPrefix) &&
m.HasVendorVariant() &&
!cc.IsVendorProprietaryModule(mctx) &&
!snapshot.IsVendorProprietaryModule(mctx) &&
strings.TrimPrefix(variation, cc.VendorVariationPrefix) == mctx.DeviceConfig().VndkVersion() {
// cc.MutateImage runs before LibraryMutator, so vendor variations which are meant for rlibs only are