diff options
| author | Colin Cross <ccross@android.com> | 2016-10-06 16:12:58 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-10-13 14:52:47 -0700 |
| commit | ce75d2c6a23fdff806466fab7ad6d8ec471182e0 (patch) | |
| tree | 7beffa26d89505d595ea3ca60bdf975d1145b7b9 /cc/binary.go | |
| parent | 4498afc55b858e856d84925281dbf254a6280efb (diff) | |
| download | build_soong-ce75d2c6a23fdff806466fab7ad6d8ec471182e0.tar.gz build_soong-ce75d2c6a23fdff806466fab7ad6d8ec471182e0.tar.bz2 build_soong-ce75d2c6a23fdff806466fab7ad6d8ec471182e0.zip | |
Initial prebuilt support
Support prebuilt shared libraries as an initial proof-of-concept of
prebuilts. Future changes will support binaries and static libraries,
and the ability to select which to use based on something besides
blueprint properties.
Test: TestPrebuilts run during m -j
Change-Id: I6e84da667e9005ae11844bad01d25cbe4ced1ce3
Diffstat (limited to 'cc/binary.go')
| -rw-r--r-- | cc/binary.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/binary.go b/cc/binary.go index 0965886f..e7d22c1f 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -81,7 +81,7 @@ func (binary *binaryDecorator) linkerProps() []interface{} { } func (binary *binaryDecorator) getStem(ctx BaseModuleContext) string { - stem := ctx.ModuleName() + stem := ctx.baseModuleName() if binary.Properties.Stem != "" { stem = binary.Properties.Stem } @@ -171,7 +171,7 @@ func (binary *binaryDecorator) linkerInit(ctx BaseModuleContext) { } if ctx.TargetPrimary() { binary.baseInstaller.Properties.Symlinks = append(binary.baseInstaller.Properties.Symlinks, - ctx.ModuleName()) + ctx.baseModuleName()) } } } |