diff options
| author | Colin Cross <ccross@android.com> | 2016-03-29 17:32:06 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-03-29 17:32:06 -0700 |
| commit | bf305dea81d301bee644416b325196bb68bd4878 (patch) | |
| tree | dfa5a95a2e7a6653e329fd684b2ba4e19c690b03 /cc | |
| parent | 7b106e4e9fb13e39ac9a1613a7ddeac3fef2d4b1 (diff) | |
| download | build_soong-bf305dea81d301bee644416b325196bb68bd4878.tar.gz build_soong-bf305dea81d301bee644416b325196bb68bd4878.tar.bz2 build_soong-bf305dea81d301bee644416b325196bb68bd4878.zip | |
Remove extension from LOCAL_MODULE_STEM
LOCAL_MODULE_STEM adds the expected extension to the installation path,
remove the extension from the filename.
Change-Id: I54dbcfa73d8d07fc3630caf2d582160003e28f79
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/androidmk.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 8b1b349c..af8347af 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -115,8 +115,10 @@ func (test *testLinker) AndroidMk(ret *common.AndroidMkData) { func (installer *baseInstaller) AndroidMk(ret *common.AndroidMkData) { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile common.Path) error { path := installer.path.RelPathString() - fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Dir(path)) - fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+filepath.Base(path)) + dir, file := filepath.Split(path) + stem := strings.TrimSuffix(file, filepath.Ext(file)) + fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+dir) + fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem) return nil }) } |