From 62560ce2c27099e75ae964946663c252c5264218 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Fri, 2 Apr 2010 13:55:02 -0700
Subject: [PATCH] Remove obsolete script from NDK build process.

After this change, we no longer require running a shell script
during the build process. This makes us less dependent on Cygwin
and is a small step towards integrating the NDK into the SDK properly.

Change-Id: I62d7e200b47c8138abb39aaf9eb0f52d3f124bdf
---
 build/core/definitions.mk | 18 ++---------------
 build/core/mkdeps.sh      | 51 -----------------------------------------------
 docs/CHANGES.TXT          |  2 ++
 3 files changed, 4 insertions(+), 67 deletions(-)
 delete mode 100755 build/core/mkdeps.sh

diff --git a/build/core/definitions.mk b/build/core/definitions.mk
index db1837d..93b5e31 100644
--- a/build/core/definitions.mk
+++ b/build/core/definitions.mk
@@ -529,10 +529,9 @@ $$(_OBJ): $$(_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK)
 	@mkdir -p $$(dir $$(PRIVATE_OBJ))
 	@echo "Compile $$(PRIVATE_ARM_TEXT)  : $$(PRIVATE_MODULE) <= $$(PRIVATE_SRC)"
 	$(hide) $$(PRIVATE_CC) $$(PRIVATE_CFLAGS) -c \
-	-MMD -MP -MF $$(PRIVATE_OBJ).d.tmp \
+	-MMD -MP -MF $$(PRIVATE_OBJ).d \
 	$$(PRIVATE_SRC) \
 	-o $$(PRIVATE_OBJ)
-	$$(call cmd-process-deps,$$(PRIVATE_OBJ))
 
 LOCAL_OBJECTS         += $$(_OBJ)
 LOCAL_DEPENDENCY_DIRS += $$(dir $$(_OBJ))
@@ -591,10 +590,9 @@ $$(_OBJ): $$(_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK)
 	@mkdir -p $$(dir $$(PRIVATE_OBJ))
 	@echo "Compile++ $$(PRIVATE_ARM_TEXT): $$(PRIVATE_MODULE) <= $$(PRIVATE_SRC)"
 	$(hide) $$(PRIVATE_CXX) $$(PRIVATE_CXXFLAGS) -c \
-	-MMD -MP -MF $$(PRIVATE_OBJ).d.tmp \
+	-MMD -MP -MF $$(PRIVATE_OBJ).d \
 	$$(PRIVATE_SRC) \
 	-o $$(PRIVATE_OBJ)
-	$$(call cmd-process-deps,$$(PRIVATE_OBJ))
 
 LOCAL_OBJECTS         += $$(_OBJ)
 LOCAL_DEPENDENCY_DIRS += $$(dir $$(_OBJ))
@@ -610,18 +608,6 @@ endef
 compile-cpp-source = $(eval $(call ev-compile-cpp-source,$1,$(1:%$(LOCAL_CPP_EXTENSION)=%.o)))
 
 # -----------------------------------------------------------------------------
-# Command   : cmd-process-deps
-# Arguments : 1: object file path
-# Returns   : None
-# Usage     : $(call cmd-process-deps,<objectfile>)
-# Rationale : To be used as a Make build command to process the dependencies
-#             generated by the compiler (in <obj>.d.tmp) into ones suited
-#             for our build system. See the comments in build/core/mkdeps.sh
-#             for more details.
-# -----------------------------------------------------------------------------
-cmd-process-deps = $(hide) $(BUILD_SYSTEM)/mkdeps.sh $(1) $(1).d.tmp $(1).d
-
-# -----------------------------------------------------------------------------
 # Command   : cmd-install-file
 # Arguments : 1: source file
 #             2: destination file
diff --git a/build/core/mkdeps.sh b/build/core/mkdeps.sh
deleted file mode 100755
index abecec7..0000000
--- a/build/core/mkdeps.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2008 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.
-#
-# This script is used to transform the dependency files generated by GCC
-# For example, a typical .d file will have a line like:
-#
-#    source.o: /full/path/to/source.c other.h headers.h
-#    ...
-#
-# the script is used to replace 'source.o' to a full path, as in
-#
-#    objs/intermediates/emulator/source.o: /full/path/to/source.c other.h headers.h
-#
-# parameters
-#
-# $1: object file (full path)
-# $2: source dependency file to modify (erased on success)
-# $3: target source dependency file
-#
-
-# quote the object path. we change a single '.' into
-# a '\.' since this will be parsed by sed.
-#
-OBJECT=`echo $1 | sed -e s/\\\\./\\\\\\\\./g`
-#echo OBJECT=$OBJECT
-
-OBJ_NAME=`basename $OBJECT`
-#echo OBJ_NAME=$OBJ_NAME
-
-# we replace $OBJ_NAME with $OBJECT only if $OBJ_NAME starts the line
-# that's because some versions of GCC (e.g. 4.2.3) already produce
-# a correct dependency line with the full path to the object file.
-# In this case, we don't want to touch anything
-#
-cat $2 | sed -e s%^$OBJ_NAME%$OBJECT%g > $3 && rm -f $2
-
-
-
diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT
index fdde18f..535071e 100644
--- a/docs/CHANGES.TXT
+++ b/docs/CHANGES.TXT
@@ -62,6 +62,8 @@ OTHER FIXES & CHANGES:
 
 - docs/CPU-ARCH-ABIS.TXT: Mention the experimental 'x86' ABI.
 
+- build/core/mkdeps.sh: Removed obsolete script.
+
 -------------------------------------------------------------------------------
 android-ndk-r3
 
-- 
2.11.0