Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac0c4be authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Normalize java source file paths before running "sort -u"." am: 0d4dad46 

am: 471d347b

* commit '471d347b':
  Normalize java source file paths before running "sort -u".
parents 5ddc4ac8 471d347b

core/config.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -550,6 +550,8 @@ else 
MD5SUM:=md5sum

MD5SUM:=md5sum

endif

endif





NORMALIZE_PATH := build/tools/normalize_path.py



APICHECK_CLASSPATH := $(HOST_JDK_TOOLS_JAR)

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)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX)

APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX)

APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX)

core/definitions.mk

+3 −3
Original line number Original line Diff line number Diff line
@@ -1804,7 +1804,7 @@ $(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \ 
          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list; \

          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list; \

fi

fi

$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \

$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

    | $(NORMALIZE_PATH) | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    $(1) -encoding UTF-8 \

    $(1) -encoding UTF-8 \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
@@ -1867,7 +1867,7 @@ $(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \ 
          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \

          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \

fi

fi

$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \

$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

    | $(NORMALIZE_PATH) | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \

$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \
@@ -1946,7 +1946,7 @@ $(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \ 
          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \

          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \

fi

fi

$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \

$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

    | $(NORMALIZE_PATH) | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \

$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

tools/normalize_path.py

0 → 100755
+24 −0
Original line number Original line Diff line number Diff line 
#!/usr/bin/env python

#

# Copyright (C) 2015 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

"""

Normalize and output paths read from stdin.

"""



import os.path

import sys



for line in sys.stdin:

  print os.path.normpath(line.strip())