summaryrefslogtreecommitdiff
path: root/ndk
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-06-09 01:15:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-09 01:15:14 +0000
commitf6ca3b75dec64aa04749883a4581ab042ca1b3ab (patch)
tree9fc6add06a2c40bd8f3755a14508d61349510786 /ndk
parentfbc8ae15b2eac98253fe979abbd9c0253df91b67 (diff)
parent397301be5ea7f7cb7cf43bb10163a31618aa1829 (diff)
am 397301be: am b71ef233: am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
* commit '397301be5ea7f7cb7cf43bb10163a31618aa1829': 64-bit mips64el-* multilib sysroot
Diffstat (limited to 'ndk')
l---------ndk/platforms/android-20/arch-mips64/lib1
l---------ndk/platforms/android-20/arch-mips64/lib-bootstrap1
-rw-r--r--ndk/platforms/android-20/arch-mips64/lib64/libc.a (renamed from ndk/platforms/android-20/arch-mips64/lib/libc.a)bin9434428 -> 9434428 bytes
-rw-r--r--ndk/platforms/android-20/arch-mips64/lib64/libm.a (renamed from ndk/platforms/android-20/arch-mips64/lib/libm.a)bin2703010 -> 2703010 bytes
-rw-r--r--ndk/platforms/android-20/arch-mips64/lib64/libstdc++.a (renamed from ndk/platforms/android-20/arch-mips64/lib/libstdc++.a)bin4176 -> 4176 bytes
-rw-r--r--ndk/platforms/android-20/arch-mips64/lib64/libz.a (renamed from ndk/platforms/android-20/arch-mips64/lib/libz.a)bin943552 -> 943552 bytes
-rw-r--r--ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.obin0 -> 2445 bytes
-rw-r--r--ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.obin0 -> 1237 bytes
-rwxr-xr-xndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.sobin0 -> 201297 bytes
-rwxr-xr-xndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.sobin0 -> 67354 bytes
-rw-r--r--ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtbegin_dynamic.o (renamed from ndk/platforms/android-20/arch-mips64/lib-bootstrap/crtbegin_dynamic.o)bin3237 -> 3237 bytes
-rw-r--r--ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtend_android.o (renamed from ndk/platforms/android-20/arch-mips64/lib-bootstrap/crtend_android.o)bin1817 -> 1817 bytes
-rwxr-xr-xndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so (renamed from ndk/platforms/android-20/arch-mips64/lib-bootstrap/libc.so)bin171169 -> 171169 bytes
-rwxr-xr-xndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so (renamed from ndk/platforms/android-20/arch-mips64/lib-bootstrap/libdl.so)bin4309 -> 4309 bytes
14 files changed, 2 insertions, 0 deletions
diff --git a/ndk/platforms/android-20/arch-mips64/lib b/ndk/platforms/android-20/arch-mips64/lib
new file mode 120000
index 000000000..94053f77e
--- /dev/null
+++ b/ndk/platforms/android-20/arch-mips64/lib
@@ -0,0 +1 @@
+../arch-mips/lib \ No newline at end of file
diff --git a/ndk/platforms/android-20/arch-mips64/lib-bootstrap b/ndk/platforms/android-20/arch-mips64/lib-bootstrap
new file mode 120000
index 000000000..7c180e0bc
--- /dev/null
+++ b/ndk/platforms/android-20/arch-mips64/lib-bootstrap
@@ -0,0 +1 @@
+../../android-9/arch-mips/lib-bootstrap \ No newline at end of file
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libc.a b/ndk/platforms/android-20/arch-mips64/lib64/libc.a
index 12d5f11fa..12d5f11fa 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libc.a
+++ b/ndk/platforms/android-20/arch-mips64/lib64/libc.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libm.a b/ndk/platforms/android-20/arch-mips64/lib64/libm.a
index 21c390bdb..21c390bdb 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libm.a
+++ b/ndk/platforms/android-20/arch-mips64/lib64/libm.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-20/arch-mips64/lib64/libstdc++.a
index 33d8bd939..33d8bd939 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a
+++ b/ndk/platforms/android-20/arch-mips64/lib64/libstdc++.a
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib/libz.a b/ndk/platforms/android-20/arch-mips64/lib64/libz.a
index f9ca4866f..f9ca4866f 100644
--- a/ndk/platforms/android-20/arch-mips64/lib/libz.a
+++ b/ndk/platforms/android-20/arch-mips64/lib64/libz.a
Binary files differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o
new file mode 100644
index 000000000..c8951c48d
--- /dev/null
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o
Binary files differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o
new file mode 100644
index 000000000..6c27ba391
--- /dev/null
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o
Binary files differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so
new file mode 100755
index 000000000..5c114157e
--- /dev/null
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so
Binary files differ
diff --git a/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so
new file mode 100755
index 000000000..a44171f18
--- /dev/null
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/crtbegin_dynamic.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtbegin_dynamic.o
index 50fae0e0a..50fae0e0a 100644
--- a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/crtbegin_dynamic.o
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtbegin_dynamic.o
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/crtend_android.o b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtend_android.o
index b0f2ebe69..b0f2ebe69 100644
--- a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/crtend_android.o
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/crtend_android.o
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/libc.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so
index a84fc91ae..a84fc91ae 100755
--- a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/libc.so
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so
Binary files differ
diff --git a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/libdl.so b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so
index b3645158e..b3645158e 100755
--- a/ndk/platforms/android-20/arch-mips64/lib-bootstrap/libdl.so
+++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so
Binary files differ