StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"

Browse Source 
* commit 'a9e5bb8a6b2b772b07214e4dd0004f6989285dd0':
  Use my-dir in a consistent way as others
This commit is contained in:
Ying Wang
2011-03-31 15:11:58 -07:00
committed by Android Git Automerger
parent 15fcee57aa a9e5bb8a6b
commit 54aa74ef5d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/definitions.mk
View File

@@ -154,7 +154,7 @@ endef
# $(1): List of directories to look for under this directory # $(1): List of directories to look for under this directory
define all-named-subdir-makefiles define all-named-subdir-makefiles
$(wildcard $(addsuffix /Android.mk, $(addprefix $(my-dir)/,$(1)))) $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))
endef endef
########################################################### ###########################################################

2
tools/Android.mk
View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
LOCAL_PATH := $(my-dir) LOCAL_PATH := $(call my-dir)
# If we're building only unbundled apps, this is the only tool we need. # If we're building only unbundled apps, this is the only tool we need.
ifneq ($(TARGET_BUILD_APPS),) ifneq ($(TARGET_BUILD_APPS),)