diff options
| author | 2021-07-22 00:57:39 +0000 | |
|---|---|---|
| committer | 2021-07-22 00:57:39 +0000 | |
| commit | 5d96f64d043af9cbd2f95d5dc076c74b7906b32f (patch) | |
| tree | 715e2d87d3dae09e736e04610f6ab8d985c52596 /rust | |
| parent | f8de870f4caecb794e22f74a81ee532e156cced9 (diff) | |
| parent | ae11c233b52cb066b85b2e556faa8ac0bd483343 (diff) | |
Merge changes I3574d2a1,Ifb69fb3d
* changes:
Update prebuilt_etc available for snapshot
Separate snapshot definition
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/Android.bp | 1 | ||||
| -rw-r--r-- | rust/library.go | 3 | ||||
| -rw-r--r-- | rust/snapshot_prebuilt.go | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/rust/Android.bp b/rust/Android.bp index 11069d143..221014e5c 100644 --- a/rust/Android.bp +++ b/rust/Android.bp @@ -11,6 +11,7 @@ bootstrap_go_package { "soong-bloaty", "soong-cc", "soong-rust-config", + "soong-snapshot", ], srcs: [ "androidmk.go", diff --git a/rust/library.go b/rust/library.go index 5a36bd13f..8c10e298b 100644 --- a/rust/library.go +++ b/rust/library.go @@ -21,6 +21,7 @@ import ( "android/soong/android" "android/soong/cc" + "android/soong/snapshot" ) var ( @@ -645,7 +646,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 diff --git a/rust/snapshot_prebuilt.go b/rust/snapshot_prebuilt.go index 2f549738c..79eaab382 100644 --- a/rust/snapshot_prebuilt.go +++ b/rust/snapshot_prebuilt.go @@ -17,6 +17,7 @@ package rust import ( "android/soong/android" "android/soong/cc" + "github.com/google/blueprint/proptools" ) |