commit 4d68879ca6a8a97f002d62c28e25fcc935246dfa
author Ying Wang <wangying@google.com> Thu Oct 22 16:30:00 2015 -0700
committer Ying Wang <wangying@google.com> Fri Oct 23 13:19:47 2015 -0700
tree 81d6938fdf4a3752e1ffa5dd1c4b6e15bb20c668
parent ac4ec1a4ea83a150e08ccd43f30fe34de52cdebf

Normalize java source file paths before running "sort -u".

We rely on "sort -u" to dedupe aidl/logtags generated java files added
by both from $(all_java_sources) and from "find
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java".
But "sort -u" doesn't work if any of the aidl/logtags source file path
has "../" in it.
This change fixes this issue by normalizing the source file paths before
passing them to "sort -u".

Change-Id: I12d2c4e0397bed9f426a1ed9b13608d72d01e0df

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 8863064..ba2e7d5 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -550,6 +550,8 @@
 MD5SUM:=md5sum
 endif
 
+NORMALIZE_PATH := build/tools/normalize_path.py
+
 APICHECK_CLASSPATH := $(HOST_JDK_TOOLS_JAR)
 APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX)
 APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX)