From 17026d03b0cc9969895f31c6d81d0aae2aff8f80 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Fri, 25 Apr 2014 23:23:25 -0700 Subject: Rename arch-x86_64/usr/lib to arch-x86_64/usr/lib64 x86_64 compiler by default looks for lib64 first. Although arch-x86_64 itself suggests 64-bit already, we want lib64 because 1. for library paths to be named consistently in x86_64 land 2. Open future possibility that both 32-/64-bit co-exist in arch-x86/, with same usr/include, but distincts usr/lib and usr/lib64 Place a symlink lib -> lib64 before changes in build/ take effects Change-Id: I073a67c4d1cc11705bb211a6a96434cecdf3457b --- 9/platforms/android-19/arch-x86_64/usr/lib | 1 + .../arch-x86_64/usr/lib/crtbegin_dynamic.o | Bin 2272 -> 0 bytes .../android-19/arch-x86_64/usr/lib/crtbegin_so.o | Bin 1976 -> 0 bytes .../android-19/arch-x86_64/usr/lib/crtbegin_static.o | Bin 2272 -> 0 bytes .../android-19/arch-x86_64/usr/lib/crtend_android.o | Bin 1231 -> 0 bytes .../android-19/arch-x86_64/usr/lib/crtend_so.o | Bin 1119 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so | Bin 11208 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libGLESv1_CM.so | Bin 41368 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libGLESv2.so | Bin 30456 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libGLESv3.so | Bin 41056 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libOpenMAXAL.so | Bin 7512 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libOpenSLES.so | Bin 7872 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libandroid.so | Bin 30408 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libc.a | Bin 10175146 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libc.so | Bin 149240 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libdl.so | Bin 5800 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libjnigraphics.so | Bin 5648 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/liblog.so | Bin 5920 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libm.a | Bin 2833196 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libm.so | Bin 40400 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libstdc++.a | Bin 38544 -> 0 bytes .../android-19/arch-x86_64/usr/lib/libstdc++.so | Bin 22200 -> 0 bytes 9/platforms/android-19/arch-x86_64/usr/lib/libz.a | Bin 1155910 -> 0 bytes .../arch-x86_64/usr/lib64/crtbegin_dynamic.o | Bin 0 -> 2272 bytes .../android-19/arch-x86_64/usr/lib64/crtbegin_so.o | Bin 0 -> 1976 bytes .../arch-x86_64/usr/lib64/crtbegin_static.o | Bin 0 -> 2272 bytes .../arch-x86_64/usr/lib64/crtend_android.o | Bin 0 -> 1231 bytes .../android-19/arch-x86_64/usr/lib64/crtend_so.o | Bin 0 -> 1119 bytes .../android-19/arch-x86_64/usr/lib64/libEGL.so | Bin 0 -> 11208 bytes .../android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so | Bin 0 -> 41368 bytes .../android-19/arch-x86_64/usr/lib64/libGLESv2.so | Bin 0 -> 30456 bytes .../android-19/arch-x86_64/usr/lib64/libGLESv3.so | Bin 0 -> 41056 bytes .../android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so | Bin 0 -> 7512 bytes .../android-19/arch-x86_64/usr/lib64/libOpenSLES.so | Bin 0 -> 7872 bytes .../android-19/arch-x86_64/usr/lib64/libandroid.so | Bin 0 -> 30408 bytes 9/platforms/android-19/arch-x86_64/usr/lib64/libc.a | Bin 0 -> 10175146 bytes 9/platforms/android-19/arch-x86_64/usr/lib64/libc.so | Bin 0 -> 149240 bytes .../android-19/arch-x86_64/usr/lib64/libdl.so | Bin 0 -> 5800 bytes .../arch-x86_64/usr/lib64/libjnigraphics.so | Bin 0 -> 5648 bytes .../android-19/arch-x86_64/usr/lib64/liblog.so | Bin 0 -> 5920 bytes 9/platforms/android-19/arch-x86_64/usr/lib64/libm.a | Bin 0 -> 2833196 bytes 9/platforms/android-19/arch-x86_64/usr/lib64/libm.so | Bin 0 -> 40400 bytes .../android-19/arch-x86_64/usr/lib64/libstdc++.a | Bin 0 -> 38544 bytes .../android-19/arch-x86_64/usr/lib64/libstdc++.so | Bin 0 -> 22200 bytes 9/platforms/android-19/arch-x86_64/usr/lib64/libz.a | Bin 0 -> 1155910 bytes 45 files changed, 1 insertion(+) create mode 120000 9/platforms/android-19/arch-x86_64/usr/lib delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_dynamic.o delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_so.o delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_static.o delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/crtend_android.o delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/crtend_so.o delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libGLESv1_CM.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libGLESv2.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libGLESv3.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libOpenMAXAL.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libOpenSLES.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libandroid.so delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/libc.a delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libc.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libdl.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libjnigraphics.so delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/liblog.so delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/libm.a delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libm.so delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.a delete mode 100755 9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.so delete mode 100644 9/platforms/android-19/arch-x86_64/usr/lib/libz.a create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/libc.a create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libc.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/libm.a create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libm.so create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a create mode 100755 9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so create mode 100644 9/platforms/android-19/arch-x86_64/usr/lib64/libz.a diff --git a/9/platforms/android-19/arch-x86_64/usr/lib b/9/platforms/android-19/arch-x86_64/usr/lib new file mode 120000 index 0000000..6b60c32 --- /dev/null +++ b/9/platforms/android-19/arch-x86_64/usr/lib @@ -0,0 +1 @@ +lib64 \ No newline at end of file diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_dynamic.o b/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_dynamic.o deleted file mode 100644 index 03cbdea..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_dynamic.o and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_so.o b/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_so.o deleted file mode 100644 index d6768bf..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_so.o and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_static.o b/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_static.o deleted file mode 100644 index 03cbdea..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/crtbegin_static.o and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_android.o b/9/platforms/android-19/arch-x86_64/usr/lib/crtend_android.o deleted file mode 100644 index 2149bf1..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_android.o and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_so.o b/9/platforms/android-19/arch-x86_64/usr/lib/crtend_so.o deleted file mode 100644 index e0041da..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/crtend_so.o and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so b/9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so deleted file mode 100755 index da6d74e..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libEGL.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv1_CM.so b/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv1_CM.so deleted file mode 100755 index 16a7659..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv1_CM.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv2.so b/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv2.so deleted file mode 100755 index 57104ab..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv2.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv3.so b/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv3.so deleted file mode 100755 index 70c97cb..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libGLESv3.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenMAXAL.so b/9/platforms/android-19/arch-x86_64/usr/lib/libOpenMAXAL.so deleted file mode 100755 index ac27304..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenMAXAL.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenSLES.so b/9/platforms/android-19/arch-x86_64/usr/lib/libOpenSLES.so deleted file mode 100755 index 95ecb48..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libOpenSLES.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libandroid.so b/9/platforms/android-19/arch-x86_64/usr/lib/libandroid.so deleted file mode 100755 index a7a40ef..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libandroid.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libc.a b/9/platforms/android-19/arch-x86_64/usr/lib/libc.a deleted file mode 100644 index 58c1a03..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libc.a and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libc.so b/9/platforms/android-19/arch-x86_64/usr/lib/libc.so deleted file mode 100755 index 24fac15..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libc.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libdl.so b/9/platforms/android-19/arch-x86_64/usr/lib/libdl.so deleted file mode 100755 index afeda71..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libdl.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libjnigraphics.so b/9/platforms/android-19/arch-x86_64/usr/lib/libjnigraphics.so deleted file mode 100755 index 0ba220e..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libjnigraphics.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/liblog.so b/9/platforms/android-19/arch-x86_64/usr/lib/liblog.so deleted file mode 100755 index 007044d..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/liblog.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libm.a b/9/platforms/android-19/arch-x86_64/usr/lib/libm.a deleted file mode 100644 index 0fd1900..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libm.a and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libm.so b/9/platforms/android-19/arch-x86_64/usr/lib/libm.so deleted file mode 100755 index d07c215..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libm.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.a b/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.a deleted file mode 100644 index 91b8ae2..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.a and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.so b/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.so deleted file mode 100755 index 9fa5287..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libstdc++.so and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib/libz.a b/9/platforms/android-19/arch-x86_64/usr/lib/libz.a deleted file mode 100644 index a715308..0000000 Binary files a/9/platforms/android-19/arch-x86_64/usr/lib/libz.a and /dev/null differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o new file mode 100644 index 0000000..03cbdea Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_dynamic.o differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o new file mode 100644 index 0000000..d6768bf Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_so.o differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o new file mode 100644 index 0000000..03cbdea Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/crtbegin_static.o differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o new file mode 100644 index 0000000..2149bf1 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_android.o differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o new file mode 100644 index 0000000..e0041da Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/crtend_so.o differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so new file mode 100755 index 0000000..da6d74e Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libEGL.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so new file mode 100755 index 0000000..16a7659 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv1_CM.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so new file mode 100755 index 0000000..57104ab Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv2.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so new file mode 100755 index 0000000..70c97cb Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libGLESv3.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so new file mode 100755 index 0000000..ac27304 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenMAXAL.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so new file mode 100755 index 0000000..95ecb48 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libOpenSLES.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so new file mode 100755 index 0000000..a7a40ef Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libandroid.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a new file mode 100644 index 0000000..58c1a03 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.a differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so new file mode 100755 index 0000000..24fac15 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libc.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so new file mode 100755 index 0000000..afeda71 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libdl.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so new file mode 100755 index 0000000..0ba220e Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libjnigraphics.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so b/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so new file mode 100755 index 0000000..007044d Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/liblog.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a new file mode 100644 index 0000000..0fd1900 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.a differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so new file mode 100755 index 0000000..d07c215 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libm.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a new file mode 100644 index 0000000..91b8ae2 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.a differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so new file mode 100755 index 0000000..9fa5287 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libstdc++.so differ diff --git a/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a new file mode 100644 index 0000000..a715308 Binary files /dev/null and b/9/platforms/android-19/arch-x86_64/usr/lib64/libz.a differ -- cgit v1.1