From 94006ac9820cea2d7c639817a664baee3b864215 Mon Sep 17 00:00:00 2001
From: Pavel Chupin <pavel.v.chupin@intel.com>
Date: Thu, 19 Dec 2013 21:20:22 +0400
Subject: [PATCH] Directories/symlinks changes for x86_64 support

* Cleaned up obsolete link in android-9
* Add symlink to lib-bootstrap in android-9
* Add symlink to crt* files sources so that we can build crt*.o for x86_64
* Moved static libs from lib to lib64 so that they can coexist with 32-bit libs
and automatically picked up by multilib compiler. Just plain move, nothing
changes;

Change-Id: Iba580f59f0538db9bc8484afd10e9cfd8b53913a
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
---
 ndk/platforms/android-20/arch-x86_64/lib-bootstrap  |   1 +
 .../android-20/arch-x86_64/{lib => lib64}/libc.a    | Bin
 .../android-20/arch-x86_64/{lib => lib64}/libm.a    | Bin
 .../arch-x86_64/{lib => lib64}/libstdc++.a          | Bin
 .../android-20/arch-x86_64/{lib => lib64}/libz.a    | Bin
 ndk/platforms/android-20/arch-x86_64/src            |   1 +
 ndk/platforms/android-9/arch-x86_64                 |   1 -
 7 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 ndk/platforms/android-20/arch-x86_64/lib-bootstrap
 rename ndk/platforms/android-20/arch-x86_64/{lib => lib64}/libc.a (100%)
 rename ndk/platforms/android-20/arch-x86_64/{lib => lib64}/libm.a (100%)
 rename ndk/platforms/android-20/arch-x86_64/{lib => lib64}/libstdc++.a (100%)
 rename ndk/platforms/android-20/arch-x86_64/{lib => lib64}/libz.a (100%)
 create mode 120000 ndk/platforms/android-20/arch-x86_64/src
 delete mode 120000 ndk/platforms/android-9/arch-x86_64

diff --git a/ndk/platforms/android-20/arch-x86_64/lib-bootstrap b/ndk/platforms/android-20/arch-x86_64/lib-bootstrap
new file mode 120000
index 000000000..050f9a226
--- /dev/null
+++ b/ndk/platforms/android-20/arch-x86_64/lib-bootstrap
@@ -0,0 +1 @@
+../../android-9/arch-x86/lib-bootstrap
\ No newline at end of file
diff --git a/ndk/platforms/android-20/arch-x86_64/lib/libc.a b/ndk/platforms/android-20/arch-x86_64/lib64/libc.a
similarity index 100%
rename from ndk/platforms/android-20/arch-x86_64/lib/libc.a
rename to ndk/platforms/android-20/arch-x86_64/lib64/libc.a
diff --git a/ndk/platforms/android-20/arch-x86_64/lib/libm.a b/ndk/platforms/android-20/arch-x86_64/lib64/libm.a
similarity index 100%
rename from ndk/platforms/android-20/arch-x86_64/lib/libm.a
rename to ndk/platforms/android-20/arch-x86_64/lib64/libm.a
diff --git a/ndk/platforms/android-20/arch-x86_64/lib/libstdc++.a b/ndk/platforms/android-20/arch-x86_64/lib64/libstdc++.a
similarity index 100%
rename from ndk/platforms/android-20/arch-x86_64/lib/libstdc++.a
rename to ndk/platforms/android-20/arch-x86_64/lib64/libstdc++.a
diff --git a/ndk/platforms/android-20/arch-x86_64/lib/libz.a b/ndk/platforms/android-20/arch-x86_64/lib64/libz.a
similarity index 100%
rename from ndk/platforms/android-20/arch-x86_64/lib/libz.a
rename to ndk/platforms/android-20/arch-x86_64/lib64/libz.a
diff --git a/ndk/platforms/android-20/arch-x86_64/src b/ndk/platforms/android-20/arch-x86_64/src
new file mode 120000
index 000000000..18d4e35d8
--- /dev/null
+++ b/ndk/platforms/android-20/arch-x86_64/src
@@ -0,0 +1 @@
+../../android-9/arch-x86/src
\ No newline at end of file
diff --git a/ndk/platforms/android-9/arch-x86_64 b/ndk/platforms/android-9/arch-x86_64
deleted file mode 120000
index fb7033ca8..000000000
--- a/ndk/platforms/android-9/arch-x86_64
+++ /dev/null
@@ -1 +0,0 @@
-arch-x86
\ No newline at end of file