diff options
| author | Conley Owens <cco3@android.com> | 2012-10-02 16:06:41 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-02 16:06:41 -0700 |
| commit | 8c37f49fd02d00b6371fb808d9a9dc836f565e02 (patch) | |
| tree | 697a06c4f2b9eac6b1182ac97f218798c37d8ef0 | |
| parent | 7e300d60bfc325e3cbf3e7656297c14109e513b8 (diff) | |
| parent | f435739bac0507b8d7711957474e2f1c5c1fdc7b (diff) | |
| download | build-8c37f49fd02d00b6371fb808d9a9dc836f565e02.tar.gz | |
Merge "Follow symlinks when using find"
| -rw-r--r-- | core/definitions.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 4dace8da4c..9d55197e20 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -178,7 +178,7 @@ endef define all-java-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.java" -and -not -name ".*") \ + find -L $(1) -name "*.java" -and -not -name ".*") \ ) endef @@ -200,7 +200,7 @@ endef define all-c-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.c" -and -not -name ".*") \ + find -L $(1) -name "*.c" -and -not -name ".*") \ ) endef @@ -222,7 +222,7 @@ endef define all-Iaidl-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "I*.aidl" -and -not -name ".*") \ + find -L $(1) -name "I*.aidl" -and -not -name ".*") \ ) endef @@ -243,7 +243,7 @@ endef define all-logtags-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.logtags" -and -not -name ".*") \ + find -L $(1) -name "*.logtags" -and -not -name ".*") \ ) endef @@ -256,7 +256,7 @@ endef define all-proto-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.proto" -and -not -name ".*") \ + find -L $(1) -name "*.proto" -and -not -name ".*") \ ) endef @@ -269,7 +269,7 @@ endef define all-renderscript-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.rs" -and -not -name ".*") \ + find -L $(1) -name "*.rs" -and -not -name ".*") \ ) endef @@ -282,7 +282,7 @@ endef define all-html-files-under $(patsubst ./%,%, \ $(shell cd $(LOCAL_PATH) ; \ - find $(1) -name "*.html" -and -not -name ".*") \ + find -L $(1) -name "*.html" -and -not -name ".*") \ ) endef @@ -301,7 +301,7 @@ endef ########################################################### define find-subdir-files -$(patsubst ./%,%,$(shell cd $(LOCAL_PATH) ; find $(1))) +$(patsubst ./%,%,$(shell cd $(LOCAL_PATH) ; find -L $(1))) endef ########################################################### @@ -314,7 +314,7 @@ endef define find-subdir-subdir-files $(filter-out $(patsubst %,$(1)/%,$(3)),$(patsubst ./%,%,$(shell cd \ - $(LOCAL_PATH) ; find $(1) -maxdepth 1 -name $(2)))) + $(LOCAL_PATH) ; find -L $(1) -maxdepth 1 -name $(2)))) endef ########################################################### |