From c0ecf33175df8ae7f401e32663e5cef288e475f5 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 26 Jan 2017 18:48:00 -0800
Subject: [PATCH] Update Android.bp for upstream changes.

Add a new define and a new source file.

Test: mm
Bug: http://b/34740564
Change-Id: I2a924e9f7e8d4d007b7f1119216b85716b97bb71
---
 Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.bp b/Android.bp
index 5df5c40f0..bb120a7d9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,6 +47,7 @@ cc_library_static {
         "src/typeinfo.cpp",
         "src/utility.cpp",
         "src/valarray.cpp",
+        "src/variant.cpp",
     ],
     local_include_dirs: ["include"],
     export_include_dirs: ["include"],
@@ -55,6 +56,7 @@ cc_library_static {
         "-nostdinc++",
         "-fexceptions",
         "-DLIBCXX_BUILDING_LIBCXXABI",
+        "-D_LIBCPP_BUILDING_LIBRARY",
     ],
     rtti: true,
     whole_static_libs: [