commit 6b46dac5a9f4d808fcd550129cb06b64b382d610
author JP Sugarbroad <jpsugar@google.com> Mon Sep 10 21:49:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 10 21:49:21 2018 +0000
tree 776ccc34701d74cefb0bfd8182a5944b954c42d5
parent 69d914c57b47c3d058aa22e49921f3d3b1faf26b
parent 41a932d50503a1f0e6e907e50a6b9ce14f640835

Merge changes from topic "am-b8fbc025-dd1b-4d0d-90bb-1a3f2f2e8d15" into nyc-dr1-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Remove build/libs am: 62a11cf698
  [RESTRICT AUTOMERGE] Remove build/libs

Android.mk

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..a1455d4
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+# We're relocating the build project to a subdirectory, then using symlinks
+# to expose the subdirectories where they used to be. If the manifest hasn't
+# been updated, we need to include all the subdirectories.
+ifeq ($(LOCAL_PATH),build)
+include $(call first-makefiles-under,$(LOCAL_PATH))
+endif