commit 5c1f3fd06819d3285cffcd466790d76012f5303a
author Jeff Gaston <jeffrygaston@google.com> Fri Aug 04 15:04:07 2017 -0700
committer Jeff Gaston <jeffrygaston@google.com> Mon Aug 07 14:21:20 2017 -0700
tree 1bfd9828feb049f30f3820297cee42a584fe2ef1
parent 1a7b46bf711699f9968f34815bf173eaaeecb081

Remove the need to find Android.mk files via directory symlinks

Bug: 64397960
Test: m -j
Change-Id: I5b77dd654dfced63900913c447b5448b632158d7

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index 9073ac3..c05d681 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -16,4 +16,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
+# Only if this Android.mk was included not by a symlink should it be used.
+# This facilitates the transition away from symlinks: b/64397960
+ifeq ($(LOCAL_PATH),build/make/tools)
 include $(call all-makefiles-under,$(LOCAL_PATH))
+endif