summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--tests/Android.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 844f052..980d0e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,6 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
-include $(call all-subdir-makefiles)
+include $(call all-makefiles-under,$(LOCAL_PATH))
endif
diff --git a/tests/Android.mk b/tests/Android.mk
index 84e9559..e33169c 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -12,4 +12,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-include $(call all-subdir-makefiles)
+LOCAL_PATH := $(call my-dir)
+include $(call all-makefiles-under,$(LOCAL_PATH))