From 48f3778cb4b86a3d5827ba4b020157ace975917b Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Wed, 7 Jul 2021 12:42:39 +0900 Subject: 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 --- rust/library.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rust/library.go') diff --git a/rust/library.go b/rust/library.go index 747a29d72..d5ab1a477 100644 --- a/rust/library.go +++ b/rust/library.go @@ -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 -- cgit v1.2.3-59-g8ed1b