From 6e18ca49f83c18772299677a4bd949d9dc978a62 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 14 Jul 2015 18:55:36 -0700
Subject: [PATCH] Fix java resource glob file list location

The source path was being appended to the module out directory
to create the file list file, which was resulting in .. in the
source path moving the file list file up the directory tree.
Use SrcDirRelPath to convert the globbed resource directories
to be relatiave to $srcDir before appending them.

Also do the same fix to generated aidl, logtags, yacc, and lex
files.

Change-Id: I2e636bd30abf03bc1d80a897951a9812cc3e09ef
---
 cc/gen.go         |  5 ++---
 common/paths.go   | 13 +++++++++++++
 java/gen.go       |  5 ++---
 java/resources.go |  3 ++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/cc/gen.go b/cc/gen.go
index bd91d647a..3bfe679dc 100644
--- a/cc/gen.go
+++ b/cc/gen.go
@@ -20,7 +20,6 @@ package cc
 
 import (
 	"path/filepath"
-	"strings"
 
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/pathtools"
@@ -51,7 +50,7 @@ var (
 )
 
 func genYacc(ctx common.AndroidModuleContext, yaccFile, yaccFlags string) (cppFile, headerFile string) {
-	cppFile = strings.TrimPrefix(yaccFile, common.ModuleSrcDir(ctx))
+	cppFile = common.SrcDirRelPath(ctx, yaccFile)
 	cppFile = filepath.Join(common.ModuleGenDir(ctx), cppFile)
 	cppFile = pathtools.ReplaceExtension(cppFile, "cpp")
 	hppFile := pathtools.ReplaceExtension(cppFile, "hpp")
@@ -74,7 +73,7 @@ func genYacc(ctx common.AndroidModuleContext, yaccFile, yaccFlags string) (cppFi
 }
 
 func genLex(ctx common.AndroidModuleContext, lexFile string) (cppFile string) {
-	cppFile = strings.TrimPrefix(lexFile, common.ModuleSrcDir(ctx))
+	cppFile = common.SrcDirRelPath(ctx, lexFile)
 	cppFile = filepath.Join(common.ModuleGenDir(ctx), cppFile)
 	cppFile = pathtools.ReplaceExtension(cppFile, "cpp")
 
diff --git a/common/paths.go b/common/paths.go
index c4bdfc72b..d92dcf919 100644
--- a/common/paths.go
+++ b/common/paths.go
@@ -15,6 +15,7 @@
 package common
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 )
@@ -105,3 +106,15 @@ func CheckSrcDirsExist(ctx AndroidModuleContext, dirs []string, prop string) {
 		}
 	}
 }
+
+// Returns a path relative to the top level source directory.  Panics if path is not inside the
+// top level source directory.
+func SrcDirRelPath(ctx AndroidModuleContext, path string) string {
+	srcDir := ctx.AConfig().SrcDir()
+	relPath, err := filepath.Rel(srcDir, path)
+	if err != nil {
+		panic(fmt.Errorf("%q is not inside %q: %s", path, srcDir, err.Error()))
+	}
+
+	return relPath
+}
diff --git a/java/gen.go b/java/gen.go
index dd86f66f0..6e8313a95 100644
--- a/java/gen.go
+++ b/java/gen.go
@@ -20,7 +20,6 @@ package java
 
 import (
 	"path/filepath"
-	"strings"
 
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/pathtools"
@@ -63,7 +62,7 @@ var (
 )
 
 func genAidl(ctx common.AndroidModuleContext, aidlFile, aidlFlags string) string {
-	javaFile := strings.TrimPrefix(aidlFile, common.ModuleSrcDir(ctx))
+	javaFile := common.SrcDirRelPath(ctx, aidlFile)
 	javaFile = filepath.Join(common.ModuleGenDir(ctx), javaFile)
 	javaFile = pathtools.ReplaceExtension(javaFile, "java")
 	depFile := javaFile + ".d"
@@ -83,7 +82,7 @@ func genAidl(ctx common.AndroidModuleContext, aidlFile, aidlFlags string) string
 }
 
 func genLogtags(ctx common.AndroidModuleContext, logtagsFile string) string {
-	javaFile := strings.TrimPrefix(logtagsFile, common.ModuleSrcDir(ctx))
+	javaFile := common.SrcDirRelPath(ctx, logtagsFile)
 	javaFile = filepath.Join(common.ModuleGenDir(ctx), javaFile)
 	javaFile = pathtools.ReplaceExtension(javaFile, "java")
 
diff --git a/java/resources.go b/java/resources.go
index 995e60df1..405d8b055 100644
--- a/java/resources.go
+++ b/java/resources.go
@@ -56,7 +56,8 @@ func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs, exclu
 		resourceDir := filepath.Join(common.ModuleSrcDir(ctx), resourceDir)
 		dirs := ctx.Glob("java_resources", resourceDir, nil)
 		for _, dir := range dirs {
-			fileListFile := filepath.Join(common.ModuleOutDir(ctx), "res", dir, "resources.list")
+			relDir := common.SrcDirRelPath(ctx, dir)
+			fileListFile := filepath.Join(common.ModuleOutDir(ctx), "res", relDir, "resources.list")
 			depFile := fileListFile + ".d"
 
 			glob := filepath.Join(dir, "**/*")