diff options
| author | Colin Cross <ccross@android.com> | 2016-05-03 14:08:40 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-05-03 14:53:18 -0700 |
| commit | e14388b9de3377955b66dc294481e23dd753ff9e (patch) | |
| tree | e2b3b9c058c6fe695815d702612cf46031bcdaf9 /cc | |
| parent | 9212b1b0d682beeb03210a975a3630db20384616 (diff) | |
| download | build_soong-e14388b9de3377955b66dc294481e23dd753ff9e.tar.gz build_soong-e14388b9de3377955b66dc294481e23dd753ff9e.tar.bz2 build_soong-e14388b9de3377955b66dc294481e23dd753ff9e.zip | |
Remove trailing / from install path
Prevents make installing files with a double /:
Install: out/target/product/generic_arm64/system/lib//libc.so
Change-Id: Iee237f344e8140c4938aa9d1e6940e4fdbfa7cd8
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/androidmk.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 0e790eb6..5b160c63 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -119,7 +119,7 @@ func (installer *baseInstaller) AndroidMk(ret *common.AndroidMkData) { path := installer.path.RelPathString() 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_PATH := $(OUT_DIR)/"+filepath.Clean(dir)) fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem) return nil }) |