diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-06-09 01:15:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-09 01:15:14 +0000 |
| commit | f6ca3b75dec64aa04749883a4581ab042ca1b3ab (patch) | |
| tree | 9fc6add06a2c40bd8f3755a14508d61349510786 /ndk | |
| parent | fbc8ae15b2eac98253fe979abbd9c0253df91b67 (diff) | |
| parent | 397301be5ea7f7cb7cf43bb10163a31618aa1829 (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/lib | 1 | ||||
| l--------- | ndk/platforms/android-20/arch-mips64/lib-bootstrap | 1 | ||||
| -rw-r--r-- | ndk/platforms/android-20/arch-mips64/lib64/libc.a (renamed from ndk/platforms/android-20/arch-mips64/lib/libc.a) | bin | 9434428 -> 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) | bin | 2703010 -> 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) | bin | 4176 -> 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) | bin | 943552 -> 943552 bytes | |||
| -rw-r--r-- | ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o | bin | 0 -> 2445 bytes | |||
| -rw-r--r-- | ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o | bin | 0 -> 1237 bytes | |||
| -rwxr-xr-x | ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so | bin | 0 -> 201297 bytes | |||
| -rwxr-xr-x | ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so | bin | 0 -> 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) | bin | 3237 -> 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) | bin | 1817 -> 1817 bytes | |||
| -rwxr-xr-x | ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libc.so (renamed from ndk/platforms/android-20/arch-mips64/lib-bootstrap/libc.so) | bin | 171169 -> 171169 bytes | |||
| -rwxr-xr-x | ndk/platforms/android-9/arch-mips/lib-bootstrap/lib64/libdl.so (renamed from ndk/platforms/android-20/arch-mips64/lib-bootstrap/libdl.so) | bin | 4309 -> 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 Binary files differindex 12d5f11fa..12d5f11fa 100644 --- a/ndk/platforms/android-20/arch-mips64/lib/libc.a +++ b/ndk/platforms/android-20/arch-mips64/lib64/libc.a diff --git a/ndk/platforms/android-20/arch-mips64/lib/libm.a b/ndk/platforms/android-20/arch-mips64/lib64/libm.a Binary files differindex 21c390bdb..21c390bdb 100644 --- a/ndk/platforms/android-20/arch-mips64/lib/libm.a +++ b/ndk/platforms/android-20/arch-mips64/lib64/libm.a diff --git a/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a b/ndk/platforms/android-20/arch-mips64/lib64/libstdc++.a Binary files differindex 33d8bd939..33d8bd939 100644 --- a/ndk/platforms/android-20/arch-mips64/lib/libstdc++.a +++ b/ndk/platforms/android-20/arch-mips64/lib64/libstdc++.a diff --git a/ndk/platforms/android-20/arch-mips64/lib/libz.a b/ndk/platforms/android-20/arch-mips64/lib64/libz.a Binary files differindex f9ca4866f..f9ca4866f 100644 --- a/ndk/platforms/android-20/arch-mips64/lib/libz.a +++ b/ndk/platforms/android-20/arch-mips64/lib64/libz.a 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 Binary files differnew file mode 100644 index 000000000..c8951c48d --- /dev/null +++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtbegin_dynamic.o 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 Binary files differnew file mode 100644 index 000000000..6c27ba391 --- /dev/null +++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/crtend_android.o 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 Binary files differnew file mode 100755 index 000000000..5c114157e --- /dev/null +++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libc.so 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 Binary files differnew file mode 100755 index 000000000..a44171f18 --- /dev/null +++ b/ndk/platforms/android-9/arch-mips/lib-bootstrap/lib32/libdl.so 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 Binary files differindex 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 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 Binary files differindex 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 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 Binary files differindex 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 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 Binary files differindex 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 |
