diff options
| author | Colin Cross <ccross@android.com> | 2016-03-30 01:15:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-30 01:15:44 +0000 |
| commit | e925ffce03086c8654265705a7e0d3f4558ff5e9 (patch) | |
| tree | b226673dc488de85e5997db1a25f2471c5c45ceb /cc | |
| parent | 110a89d2c57a31f7e2ad7e15a70dca77167da68d (diff) | |
| parent | bf305dea81d301bee644416b325196bb68bd4878 (diff) | |
| download | build_soong-e925ffce03086c8654265705a7e0d3f4558ff5e9.tar.gz build_soong-e925ffce03086c8654265705a7e0d3f4558ff5e9.tar.bz2 build_soong-e925ffce03086c8654265705a7e0d3f4558ff5e9.zip | |
Merge "Remove extension from LOCAL_MODULE_STEM"
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 }) } |