StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove extension from LOCAL_MODULE_STEM" am: e925ffc

Browse Source 
am: 9b79db3

* commit '9b79db366e7e35ce4277d4a9c11d2a0ff0847167':
  Remove extension from LOCAL_MODULE_STEM

Change-Id: I623dc4fc4ef659ac80767f6f11a566a78fa460b8
This commit is contained in:
Colin Cross
2016-03-30 01:59:13 +00:00
committed by android-build-merger
parent d2d8cac61a 9b79db366e
commit d717c22685
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/androidmk.go
View File

@@ -115,8 +115,10 @@ func (test *testLinker) AndroidMk(ret *common.AndroidMkData) {
func (installer *baseInstaller) AndroidMk(ret *common.AndroidMkData) { func (installer *baseInstaller) AndroidMk(ret *common.AndroidMkData) {
ret.Extra = append(ret.Extra, func(w io.Writer, outputFile common.Path) error { ret.Extra = append(ret.Extra, func(w io.Writer, outputFile common.Path) error {
path := installer.path.RelPathString() path := installer.path.RelPathString()
fmt.Fprintln(w, "LOCAL_MODULE_PATH := $(OUT_DIR)/"+filepath.Dir(path)) dir, file := filepath.Split(path)
fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+filepath.Base(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 return nil
}) })
} }