Fix error in build when OUT_DIR_COMMON_BASE is used
Without this change, gen-kotlin-build-file.sh will generate kotlinc-build.xml file with path that look like: /path/to/aosp-top//path/to/aosp-out/soong/.intermediates/... Also fixed a couple lint errors. Test: Set OUT_DIR_COMMON_BASE and was able to build Bug: 111309264 Change-Id: I86173571667deca79ee0d9a7324715c9a0e4cd97
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
# Generates kotlinc module xml file to standard output based on rsp files
|
# Generates kotlinc module xml file to standard output based on rsp files
|
||||||
|
|
||||||
if [ -z "$1" ]; then
|
if [[ -z "$1" ]]; then
|
||||||
echo "usage: $0 <classpath> <outDir> <rspFiles>..." >&2
|
echo "usage: $0 <classpath> <outDir> <rspFiles>..." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -30,24 +30,36 @@ classpath=$1
|
|||||||
out_dir=$2
|
out_dir=$2
|
||||||
shift 2
|
shift 2
|
||||||
|
|
||||||
# Path in the build file are relative to the build file, we need to make them absolute.
|
# Path in the build file may be relative to the build file, we need to make them
|
||||||
prefix=`pwd`
|
# absolute
|
||||||
|
prefix="$(pwd)"
|
||||||
|
|
||||||
|
get_abs_path () {
|
||||||
|
local file="$1"
|
||||||
|
if [[ "${file:0:1}" == '/' ]] ; then
|
||||||
|
echo "${file}"
|
||||||
|
else
|
||||||
|
echo "${prefix}/${file}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Print preamble
|
# Print preamble
|
||||||
echo "<modules><module name=\"name\" type=\"java-production\" outputDir=\"${out_dir}\">"
|
echo "<modules><module name=\"name\" type=\"java-production\" outputDir=\"${out_dir}\">"
|
||||||
|
|
||||||
# Print classpath entries
|
# Print classpath entries
|
||||||
for file in $(echo $classpath | tr ":" "\n"); do
|
for file in $(echo "$classpath" | tr ":" "\n"); do
|
||||||
echo " <classpath path=\"${prefix}/${file}\"/>"
|
path="$(get_abs_path "$file")"
|
||||||
|
echo " <classpath path=\"${path}\"/>"
|
||||||
done
|
done
|
||||||
|
|
||||||
# For each rsp file, print source entries
|
# For each rsp file, print source entries
|
||||||
while (( "$#" )); do
|
while (( "$#" )); do
|
||||||
for file in $(cat $1); do
|
for file in $(cat "$1"); do
|
||||||
|
path="$(get_abs_path "$file")"
|
||||||
if [[ $file == *.java ]]; then
|
if [[ $file == *.java ]]; then
|
||||||
echo " <javaSourceRoots path=\"${prefix}/${file}\"/>"
|
echo " <javaSourceRoots path=\"${path}\"/>"
|
||||||
elif [[ $file == *.kt ]]; then
|
elif [[ $file == *.kt ]]; then
|
||||||
echo " <sources path=\"${prefix}/${file}\"/>"
|
echo " <sources path=\"${path}\"/>"
|
||||||
else
|
else
|
||||||
echo "Unknown source file type ${file}"
|
echo "Unknown source file type ${file}"
|
||||||
exit 1
|
exit 1
|
||||||
|
Reference in New Issue
Block a user