commit 6f16baeea9c58223d5ea29a9e1c8468abf172904
author David Gross <dgross@google.com> Wed Mar 11 15:25:20 2020 -0700
committer David Gross <dgross@google.com> Thu Mar 12 16:53:46 2020 +0000
tree 4fadf2107822d59c14dffbdc197c761ea1396e73
parent 7fe8024a200a922ba9e6d3a2754685493c20142c

For darwin, add lib64/libc++abi.1.dylib.

libc++.1.dylib, which was already added, depends on this.

Bug: 148267171
Bug: 142590626
Bug: 144040336
Test: N/A
Merged-In: Ifd5b2db7b18a29c1b58b408118951792733649b7
Change-Id: Ifd5b2db7b18a29c1b58b408118951792733649b7
(cherry picked from commit f879b7a53cc6546e7af885e19bf49b2a15e55489)

build/sdk-darwin-x86.atree

diff --git a/build/sdk-darwin-x86.atree b/build/sdk-darwin-x86.atree
index b278c10..67645bd 100644
--- a/build/sdk-darwin-x86.atree
+++ b/build/sdk-darwin-x86.atree
@@ -41,9 +41,10 @@
 prebuilts/sdk/tools/darwin/bin/x86_64-linux-android-ld    strip build-tools/${PLATFORM_NAME}/x86_64-linux-android-ld
 prebuilts/sdk/tools/darwin/bin/mipsel-linux-android-ld    strip build-tools/${PLATFORM_NAME}/mipsel-linux-android-ld
 
-prebuilts/sdk/tools/lld                                 build-tools/${PLATFORM_NAME}/lld
-prebuilts/sdk/tools/darwin/bin/lld                strip build-tools/${PLATFORM_NAME}/lld-bin/lld
-prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib   strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
+prebuilts/sdk/tools/lld                                    build-tools/${PLATFORM_NAME}/lld
+prebuilts/sdk/tools/darwin/bin/lld                   strip build-tools/${PLATFORM_NAME}/lld-bin/lld
+prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib      strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
+prebuilts/sdk/tools/darwin/lib64/libc++abi.1.dylib   strip build-tools/${PLATFORM_NAME}/lib64/libc++abi.1.dylib
 
 dalvik/dx/etc/mainDexClasses                                build-tools/${PLATFORM_NAME}/mainDexClasses