[PATCH] D63017: [Android] add toplevel Android.mk to stop breakage

[Nick Desaulniers via Phabricator via llvm-commits]

nickdesaulniers created this revision.
nickdesaulniers added reviewers: srhines, danalbert, MikeDvorskiy.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Android is currently moving over to building AOSP's LLVM release from
the monorepo. In testing, we were hitting breakage due to the Android.mk
file under pstl/ (parallel STL). Previously, Android was not including
pstl/ as a separate repo and now with the monorepo we get it no matter
what (and will probably use it soon).

The issue for Android's build system is that it recursively looks for
Android.mk files, so it picks up the one under pstl/ even though we
don't want to build it just yet.

The sugguested fix from Android's build team is to add an empty
Android.mk to the top level directory, which will prevent the build
system from recursing further, finding the one in pstl/, and erroring
out.

Link: https://android-review.googlesource.com/c/platform/manifest/+/977993


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D63017

Files:
  Android.mk


Index: Android.mk
===================================================================
--- /dev/null
+++ Android.mk
@@ -0,0 +1,10 @@
+#===-- Android.mk --------------------------------------------------------===##
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+#===----------------------------------------------------------------------===##
+#
+# Intentionally empty to prevent Android's build system from loading deeper
+# Android.mk files such as from pstl.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63017.203590.patch
Type: text/x-patch
Size: 620 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190607/b2ab7cdc/attachment.bin>