summaryrefslogtreecommitdiffstats
path: root/NativeCode.mk
Commit message (Collapse)AuthorAgeFilesLines
* Use libziparchive shared library on host.Narayan Kamath2015-04-291-2/+2
| | | | | | Fixes host run-tests that were broken by de9a75e2ab579804ea44f9688 Change-Id: I0cbd40048f9a222996858f3574d6faa93121a61f
* Add a static dependency on libbase.Narayan Kamath2015-04-291-2/+2
| | | | | | | | | | Pulled in by the static libziparchive dependency. Note that we can't add these dependencies in the sub-makefile because libziparchive has different module names for target vs host (libziparchve vs libziparchive-host). Change-Id: Ie2e036f9e1bfd13d439501e2577651e42642c1bd
* Remove forced alignment code.Christopher Ferris2015-03-231-0/+31
| | | | | | | | | | | | | | | | | | | | | The move from to gcc 4.8 to gcc 4.9 for arm32 introduced a bug in this code. The original code is trying to out smart the compiler by arch, but we got caught. Running benchmarks, the amount of time we save by doing this is in the nanosecond range, so just let the compiler figure things out on it's own. It turns out for aarch64, x86, x86_64, two of the functions produce exactly the same code. For swapLongs, x86/x86_64 produces slightly different code but is about the same performance. For arm32, letting the compiler optimize also leads to about the same performance. Adding unit tests and benchmark code for these. Bug: 19692084 Change-Id: I858eb3147ef1e9e2c1894ddb226cdddcc0baf933
* Explicitly specify the icu:: namespace.Elliott Hughes2015-03-061-1/+1
| | | | | Bug: 15350832 Change-Id: I8d84f3e50b643806ccf01190797c69ce6445b539
* Remove OpenSSL ENGINE testKenny Root2015-02-271-1/+0
| | | | | | | The tests that exercise this code were removed. This code doesn't compile with BoringSSL, so just remove it. Change-Id: I9598ef5e5a2d7b7d115b63b5b670976d39ca1405
* Don't try to build the libcore native code on the Mac.Elliott Hughes2014-12-171-0/+4
| | | | Change-Id: I79c5389af44ff2aea784d4f57c82d6aebf560132
* Remove unnecessary include directives.Elliott Hughes2014-12-151-2/+2
| | | | | | These are all picked up by virtue of the libraries that we use. Change-Id: Ib5e86c65d53f3448d5f1d0c0d24f0f63ef5f1868
* am e4298641: Merge "Fix the Mac build by moving libcore to libc++."Dan Albert2014-11-051-0/+2
|\ | | | | | | | | * commit 'e42986412a3270c84842aefc0c7da5796429f64c': Fix the Mac build by moving libcore to libc++.
| * Fix the Mac build by moving libcore to libc++.Dan Albert2014-11-041-0/+2
| | | | | | | | | | | | | | | | Since libcore is now using std::unique_ptr, we need to have a sane, modern STL on all platforms. Since the Mac build is stuck on libstdc++ 4.2, use libc++. Change-Id: Id4cd32fa181ae53123f808a9366211748c44276f
* | resolved conflicts for merge of f9a3c05f to stage-aosp-masterIan Rogers2014-11-051-2/+2
|\ \ | |/ | | | | Change-Id: Id4220cfc2f845d04b32404171cde1fd144fe1585
| * Move from UniquePtr to std::unique_ptr.Ian Rogers2014-11-041-2/+2
| | | | | | | | | | | | Switch from stlport to libcxx as stlport lacks std::unique_ptr. Change-Id: I45a3588a8ecf4689521f1df6654ed279a6d0669e
* | am 60e4a65d: am 916c54b2: Merge "Enable host multilib for ART testing."Ian Rogers2014-06-251-0/+1
|\ \ | |/ | | | | | | * commit '60e4a65d7c30ea0b5456933db9a1aa75e4a3f645': Enable host multilib for ART testing.
| * Enable host multilib for ART testing.Ian Rogers2014-06-171-0/+1
| | | | | | | | Change-Id: I7827331202482e28e824fc6583f590ddadaa2087
* | am 209d4528: am 0a58ece3: Merge "Fix Mac build."Ian Rogers2014-06-111-1/+4
|\ \ | |/ | | | | | | * commit '209d452845cb371854a940455e60496b029ac422': Fix Mac build.
| * Fix Mac build.Ian Rogers2014-06-101-1/+4
| | | | | | | | Change-Id: I32fdb9dabbc87d49e0be82ea39c2eea6f452fd6f
* | am cc6d37df: am 4aa9da3f: Merge "Build fix."Ian Rogers2014-06-111-1/+1
|\ \ | |/ | | | | | | * commit 'cc6d37df1373291d98718f7c93dbb5cd65d4c0bb': Build fix.
| * Build fix.Ian Rogers2014-06-091-1/+1
| | | | | | | | Change-Id: I52559cfcc806dfe0d8682be50a6078cb678e4169
* | am a97fc534: am a3f1cb68: Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-111-17/+15
|\ \ | |/ | | | | | | * commit 'a97fc53412f89f211433406d86e5674def6d3314': Remove deprecated WITH_HOST_DALVIK.
| * Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-091-17/+15
| | | | | | | | | | | | | | | | | | | | Bug: 13751317 Fix the Mac host build: - conditionally define constants using pre-existing pattern, - make Posix calls that the Mac doesn't support throw UnsupportedOperationException. Change-Id: Ib68887cbe36ab167d042eb96c7834bce0651b078
* | am 9de62953: am 694b7052: am 697dc169: Merge "Build libcore native code on ↵Ian Rogers2014-05-231-0/+2
|\ \ | |/ | | | | | | | | | | the host with clang." * commit '9de62953e121019594298b79c07cc7c1d5c956f2': Build libcore native code on the host with clang.
| * Build libcore native code on the host with clang.Ian Rogers2014-05-231-0/+2
| | | | | | | | | | Bug: 13751317 Change-Id: I9932b60b892d878bdac9ab30a37621f26910f358
* | Add support for network-specific host name resolution.Paul Jensen2014-05-131-1/+1
|/ | | | | | For now all such support is hidden. Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070
* Finish moving away from LD_LIBRARY_PATH on Android.Elliott Hughes2014-04-031-1/+1
| | | | | | | | We'll still use LD_LIBRARY_PATH if it's set, for testing or for the host, but we now ask the dynamic linker what to do. Bug: 12585421 Change-Id: I1457a63ead89fa8f8aeabc002c0b9038295b886e
* Add libutils dependency for libziparchive.Narayan Kamath2013-12-111-2/+2
| | | | Change-Id: Ie5f4e20eb19a17d37abf8720e4bfeade6c248967
* Add a JNI wrapper over libziparchive.Narayan Kamath2013-12-061-2/+2
| | | | | | | | | | | | | | | | | | All functions delegate directly to the native code. We do not perform any sort of central directory or local file related lookups in the java layer. For each entry, libziparchive gives us an offset to the start of data for the entry and the compressed size. We use a RandomAccessFile to seek to that offset and then construct an InputStream that's bounded between [offset, offset + compressed_size). We reuse existing code (JarVerifier / Manifest) for certificate validation & collection. bug: 10193060 Change-Id: I21eb4e6dc6aa8749e3f63830f9799e1f621d26e6
* A simple set of JNI argument passing tests.Ian Rogers2013-11-051-0/+1
| | | | | | Change-Id: Ibf2051fae4b5026a4a14fcdc27be71415520d117 (cherry picked from commit cd8016c67b7f215bf374467257ede53197c44423)Conflicts:
* Split Conscrypt makefile out from libcoreKenny Root2013-09-161-47/+0
| | | | Change-Id: I6c12a0e038a86b186b5d88b9f0ff28b8480b4aed
* Conscrypt: remove dependence on stlportKenny Root2013-09-111-1/+0
| | | | | | | This helps with unbundling of Conscrypt by not forcing the app to include a static version of stlport in their program. Change-Id: I5bd17213059b8ae4d8d86921d82b43465253a62f
* Fixed interruption of blocked SSLSocket via Socket.close()Brian Carlstrom2013-09-101-9/+6
| | | | | | | | Bug: 10599593 (cherry picked from commit 3f17b9a79c4331504f32d34ce46adf7a78870f87) Change-Id: I1bffa8189d64aa8ee0aa1ac414359aecb71934a5
* Move conscrypt out libjavacore and split testsKenny Root2013-08-301-5/+39
| | | | | | | | | To make the situation with testing a little better and enable building core libraries totally independent of conscrypt, move the native registration to a JNI_OnLoad scheme. Also, since we want to separate the testing, make conscrypt build its own tests library. Change-Id: I9f2831839059c1c012ec7bdeab2f90b4e2f44bfd
* Move libcore to C++11.Elliott Hughes2013-08-121-0/+1
| | | | Change-Id: I1942be8f7cef51265d53272f36a217e88bfede94
* Bring NativeCode.mk in line with the internal copy.Elliott Hughes2013-07-301-5/+4
| | | | Change-Id: I4b42be83871a852d087ff9da6eeca8c5a08b1f19
* Fix libcore's NativeCode.mk so we actually compile with -Werror.Elliott Hughes2013-07-301-43/+23
| | | | Change-Id: Ib665ea7c6f54e43851bc04f0265e65218407c70f
* Move System.currentTimeMillis, nanoTime, and mapLibraryName into the library.Elliott Hughes2013-06-071-1/+1
| | | | | | (cherry-picked from commit 37d6cc06f62b2029663137a1b8c18242152c1e97) Change-Id: I3b3aa3f508b9c6f43b27022cd8bc9aa82e630e01
* Tracking libnativehelper dependenciesBrian Carlstrom2013-05-101-0/+1
| | | | Change-Id: Icf5c2a3989f4bf8adf084bcb03001b53189c0309
* Add -host suffix for master changesKenny Root2013-05-021-1/+1
| | | | | | (cherry picked from commit 518022767ec57e73205e5365de23a15076419364) Change-Id: I7a16bfd5213837a65062b7b7d78f610679cbf441
* Merge "NativeCrypto: build native library standalone"Kenny Root2013-05-021-0/+15
|\
| * NativeCrypto: build native library standaloneKenny Root2013-05-021-0/+15
| | | | | | | | Change-Id: I678f5c1b985d72ab1d41ae22dfcae35814c44e85
* | Tracking changes to *-host for host shared librariesBrian Carlstrom2013-05-011-32/+10
|/ | | | Change-Id: I88dd48b09b9148246884a1c84b26787500c24569
* Move JSSE to new packageKenny Root2013-04-291-2/+3
| | | | | | | | To help with shipping the JSSE with apps that want to bundle it, move it to a new package so that the tangles in other parts of the library can be untangled. Change-Id: I810b6861388635301e28aee5b9b47b8e6b35b430
* Change native test module nameKenny Root2013-02-011-2/+2
| | | | Change-Id: Ie4f9c5a2fb440d8455748bc30949b8b956d75625
* NativeCrypto: add test base for OpenSSL ENGINEsKenny Root2013-01-281-0/+66
| | | | | | | This sets up some of the testing infrastructure to allow us to test all the ENGINE-related test paths in the NativeCrypto code. Change-Id: I21f3dbebbaa90327d48a99020ae3a3e90624cc75
* Add dependencies on the makefiles.Elliott Hughes2012-08-281-0/+3
| | | | | | | I've been enjoying this in bionic for a while now, and was annoyed not to have make do the right thing in libcore. Change-Id: Idcd2db48349202259887499a1f47d85c5d205d54
* Stop using -fvisibility=hidden.Elliott Hughes2012-08-011-3/+0
| | | | | | | | | | | It breaks backtraces, and backtraces are useful. (The debugger uses the ELF debug info, so it doesn't care, but backtracing just uses the symbols.) (cherry-pick of da2fb9754a9ccfa954c1b554982f06e7cf7d680a.) Bug: 6447213 Change-Id: I957df0e935b61bcf5fefc0e506ecdaa862bc7d07
* Make libjavacore independent of libnativehelper for the PDK.Elliott Hughes2012-05-041-5/+8
| | | | | Bug: 6369821 Change-Id: Ie038571a5dac1f301c0c3c6fb84df432e67b62c0
* am 617f435b: am 8d778522: am 61f172cd: Merge "Simplify and speed up makefile."Jean-Baptiste Queru2012-04-241-14/+1
|\ | | | | | | | | * commit '617f435b7decc07c3721b45edb0f4e7c4c2e54a5': Simplify and speed up makefile.
| * Simplify and speed up makefile.Jean-Baptiste Queru2012-04-191-14/+1
| | | | | | | | | | | | | | | | | | | | No need to shell out just to find 2 makefiles that very rarely change. As an added bonus, this fixes a bug that appears when the cd command actually prints some output, which it does when certain environment variables are set. Change-Id: Iab7a738c2ca62f3c591c3bf1f47b70407b90e99a
* | Restrict -fvisibility-inlines-hidden to C++ codeAndy McFadden2012-01-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | gcc objects to using -fvisibility-inlines-hidden with C code: cc1: error: command line option "-fvisibility-inlines-hidden" is valid for C++/ObjC++ but not for C Move it from CFLAGS to CPPFLAGS. Change-Id: I151530748b0d083d8edb50df94db23d101ad01c6
* | Remove static libraries from static library module.Ying Wang2011-11-071-2/+0
|/ | | | | | | | | Bug: 5573756 Static library does not link against libraries. The listed host libraries actually don't exist. We need this change to fix bug 5573756. Change-Id: I2e6f53c87b9506e8caaa701ef5b62ae578d8ef5b
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-2/+0
| | | | | | Bug: 5010576 Change-Id: Id881173e71e4f3a76abd46e209bb63e0248ec1e0