From e14388b9de3377955b66dc294481e23dd753ff9e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 3 May 2016 14:08:40 -0700 Subject: [PATCH] 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 --- cc/androidmk.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/androidmk.go b/cc/androidmk.go index 0e790eb6a..5b160c637 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 })