diff options
| author | Inseob Kim <inseob@google.com> | 2020-07-01 07:48:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-01 07:48:51 +0000 |
| commit | 4c845264a2250fe726ee4da03b461ac749f6ddd2 (patch) | |
| tree | 55b470bf9b9b28e74312662cf3c3da3a01c89e33 | |
| parent | d8f1b81e754a8bdb73315223ad5e903ac78e7217 (diff) | |
| parent | f99b355c0ab24a795c0956351cf5a05409e9c519 (diff) | |
| download | build_soong-4c845264a2250fe726ee4da03b461ac749f6ddd2.tar.gz build_soong-4c845264a2250fe726ee4da03b461ac749f6ddd2.tar.bz2 build_soong-4c845264a2250fe726ee4da03b461ac749f6ddd2.zip | |
Merge "Include shared lib in vendor snapshot if isVndkExt" into rvc-dev
| -rw-r--r-- | cc/vendor_snapshot.go | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go index b89640a8..b11b1a82 100644 --- a/cc/vendor_snapshot.go +++ b/cc/vendor_snapshot.go @@ -569,7 +569,13 @@ func isVendorSnapshotModule(m *Module, moduleDir string) bool { return m.outputFile.Valid() && proptools.BoolDefault(m.VendorProperties.Vendor_available, true) } if l.shared() { - return m.outputFile.Valid() && !m.IsVndk() + if !m.outputFile.Valid() { + return false + } + if !m.IsVndk() { + return true + } + return m.isVndkExt() } return true } @@ -669,7 +675,16 @@ func (c *vendorSnapshotSingleton) GenerateBuildActions(ctx android.SingletonCont // Common properties among snapshots. prop.ModuleName = ctx.ModuleName(m) - prop.RelativeInstallPath = m.RelativeInstallPath() + if m.isVndkExt() { + // vndk exts are installed to /vendor/lib(64)?/vndk(-sp)? + if m.isVndkSp() { + prop.RelativeInstallPath = "vndk-sp" + } else { + prop.RelativeInstallPath = "vndk" + } + } else { + prop.RelativeInstallPath = m.RelativeInstallPath() + } prop.RuntimeLibs = m.Properties.SnapshotRuntimeLibs prop.Required = m.RequiredModuleNames() for _, path := range m.InitRc() { |