summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Move hwc tests to libc++.Dan Albert2014-11-042-37/+32
| | | | | | | | | Since these tests were pulling in a static library linked against stlport, the tests needed to be explicit about which STL they're using. Might as well be libc++. Bug: 15193147 Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e
* Merge "Avoid two warnings from clang."Chih-Hung Hsieh2014-11-041-13/+11
|\
| * Avoid two warnings from clang.Chih-Hung Hsieh2014-10-311-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | Clang compiler warns about undefined static functions like getReturnString before all references are removed inside IF_LOG_COMMANDS. To remove such warnings, we can leave those static functions defined and the compiler will remove them at the end when they are not used. Add a cast to long before converting from int to void*, to avoid type cast warnings on 64 bit targets. BUG: 17043248 Change-Id: Ica31101522279d2c8eacc90e2939767002fb827b
* | Merge "Initialize ARect fields in default ctor"Dan Stoza2014-10-291-0/+1
|\ \ | |/ |/|
| * Initialize ARect fields in default ctorDmitriy Ivanov2014-10-291-0/+1
|/ | | | | | | So that we can use Rect() for update and such. Bug: 18095940 Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
* Merge "Switch to libsigchain.a"Dmitriy Ivanov2014-10-212-23/+4
|\
| * Switch to libsigchain.aDmitriy Ivanov2014-10-202-23/+4
|/ | | | | | | Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker to export symbols from the static library. Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
* Merge "Some more test cleanup."Dan Albert2014-10-172-30/+36
|\
| * Some more test cleanup.Dan Albert2014-10-162-30/+36
|/ | | | | | | | | Needed to build successfully when libc++ is the default STL. Also fix a missing include. Not sure how this was getting by before. Probably some transitive include. Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837
* Merge "Use LOCAL_CLANG := false for GLES wrappers for now"Chih-hung Hsieh2014-10-161-0/+2
|\
| * Use LOCAL_CLANG := false for GLES wrappers for nowBernhard Rosenkraenzer2014-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | GLES wrappers built with clang currently result in crashes in libhwui, UI doesn't come up. Force gcc for the wrappers until this is investigated and fixed properly. Bug: 18003438 Change-Id: I24a17ec019409930883da8040fe2fb05b0fea0c5 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | Merge "Don't check if this == NULL."Dan Albert2014-10-153-4/+8
|\ \
| * | Don't check if this == NULL.Dan Albert2014-09-163-4/+8
| | | | | | | | | | | | | | | | | | | | | Entering a method with this == NULL is undefined behavior. Clang whines about this. Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
* | | Merge "Link sigchain to surfaceflinger main executable"Dmitriy Ivanov2014-10-142-3/+27
|\ \ \ | |_|/ |/| |
| * | Link sigchain to surfaceflinger main executableDmitriy Ivanov2014-10-092-3/+27
|/ / | | | | | | | | | | | | | | And export necessary symbols to preempt calls from libart.so Bug: 15345057 Bug: 15426766 Change-Id: If0b7f59a59824e30aa0c33dad76c7a44932180de
* | Merge "Allow more than one dex2oat extra option"Narayan Kamath2014-10-011-5/+38
|\ \
| * | Allow more than one dex2oat extra optionYevgeny Rouban2014-09-171-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | All extra options are provided as one argument to dex2oat. The patch splits all options to individual ones. Change-Id: Ied65bb9cf38b114611e88a8d5d86305021700d0b Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com> Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
* | | Merge "Fix a null dereference."Dan Albert2014-09-231-1/+1
|\ \ \ | |/ / |/| |
| * | Fix a null dereference.Dan Albert2014-09-231-1/+1
|/ / | | | | | | Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
* | Merge "Clean cruft out of makefiles."Dan Albert2014-09-128-49/+17
|\ \
| * | Clean cruft out of makefiles.Dan Albert2014-09-118-49/+17
|/ / | | | | | | | | | | | | Cleans up manual uses of stlport and bionic (and removes uses of private bionic headers). Change-Id: I157309d702e59152adfa3450939082248ae4c043
* | Merge "Fix warnings on unused variables and parameters."Chih-Hung Hsieh2014-09-123-28/+25
|\ \
| * | Fix warnings on unused variables and parameters.Chih-Hung Hsieh2014-09-113-28/+25
| | | | | | | | | | | | | | | BUG: 17474723 Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217
* | | Merge "Work around C11 const atomic restrictions."Hans Boehm2014-09-111-1/+9
|\ \ \ | |/ / |/| |
| * | Work around C11 const atomic restrictions.Hans Boehm2014-09-111-1/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cast away the const qualifier in BBinder::findObject. C11, unlike C++11, does not allow loads from const atomics. This is widely regarded as a bug (see WG14 DR 459). This is a hack to work around it until it's officially fixed in the spec. load_const_atomic was adapted from commit 1e8587a479fd8b1ce9b594298a93f517816e8f15 I don't think we want to dignify this by putting it into a header file. Bug:17067219 Change-Id: Icbfcbda2722e6f80d2bb065a0bb3ec7634bcacb2
* | Merge "Silence warnings about unused parameters."Dan Albert2014-09-116-15/+15
|\ \
| * | Silence warnings about unused parameters.Dan Albert2014-09-096-15/+15
| |/ | | | | | | Change-Id: I503aafbdeaec3f53241872dc52af9f8b73a1416c
* | Merge "Fix clang warnings about struct vs. class."Dan Albert2014-09-103-3/+3
|\ \
| * | Fix clang warnings about struct vs. class.Dan Albert2014-09-093-3/+3
| |/ | | | | | | Change-Id: I9f26cd01ac3153efa6d77a4133686842e2d63203
* | Merge "Use time() instead of clock() for timeouts."Christopher Ferris2014-09-091-4/+4
|\ \ | |/ |/|
| * Use time() instead of clock() for timeouts.Christopher Ferris2014-09-091-4/+4
|/ | | | | | | | | | | | | The clock() function returns the processor time used by the process. This is not a good timeout mechanism since the code is suspended most of the time waiting for the forked process to finish. Replace with the time() function. Bug: 17154069 (cherry picked from commit 89d4949f86f4f7b6710e951afefad186c667fd6e) Change-Id: I42f0f24ee53ef99955fd482a1089e39d491f3bd5
* Merge "Make string literal concatenation play nice with C++11."Dan Albert2014-09-095-25/+25
|\
| * Make string literal concatenation play nice with C++11.Dan Albert2014-09-085-25/+25
| | | | | | | | | | | | | | In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user defined literal. Add space around the macro. Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
* | Merge "Fix relabeling of secondary user package directories."Nick Kralevich2014-09-081-1/+1
|\ \ | |/ |/|
| * Fix relabeling of secondary user package directories.Stephen Smalley2014-09-081-1/+1
|/ | | | | | | | | When relabeling secondary user package directories, we need to use the uid of the directory rather than the primary package UID; otherwise, levelFrom=user will not work correctly. Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* Merge "Remove obsolete prunedexcache"Brian Carlstrom2014-08-283-55/+0
|\
| * Remove obsolete prunedexcacheAlex Light2014-08-283-55/+0
|/ | | | | Bug: 16875245 Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
* Merge "Add vm_safe_mode to dexopt."Calin Juravle2014-08-273-10/+16
|\
| * Add vm_safe_mode to dexopt.Calin Juravle2014-08-273-10/+16
|/ | | | | | | | | | | The flag enforces interpret-only flag for dex2oat. Bug: 12457423 (cherry picked from commit b1efac103523efccbe671e76cc0eaaeab810415b) (cherry picked from commit 97477d203eaf0c3235bbe2415356f20a0431cada) Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
* Merge "Pass isa features flag to dex2oat."Calin Juravle2014-08-261-8/+21
|\
| * Pass isa features flag to dex2oat.Calin Juravle2014-08-261-8/+21
| | | | | | | | | | | | | | | | Bug: 16716262 (cherry picked from commit 8fc7315a67fdbf9b56cc6fa061f0773be2223a81) Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a
* | Merge "Fix validation of system paths in installd."Calin Juravle2014-08-222-27/+67
|\ \ | |/
| * Fix validation of system paths in installd.Calin Juravle2014-08-222-27/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System apps are now installed under their own directory (system_app_dir/app_dir/app.apk). The new path doesn't pass installd validation because of obsolete checks which verify that the path does not contain subdirectories past the system_app_dir. The CL fixes the validation to accept at most on subdirectory. Bug: 17109858 (cherry picked from commit c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c) Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
* | Merge "Allow apk path to contain one subdirectory."Calin Juravle2014-08-222-26/+27
|\ \ | |/
| * Allow apk path to contain one subdirectory.Calin Juravle2014-08-222-26/+27
|/ | | | | | | | | | | In the current directory layout this prevented rm_dex and move_dex commands to validate the apk path and thus cleaning up resources. Bug: 16888084 (cherry picked from commit fd88ff2edd954117e36372fb095b6f5f35aad0e3) Change-Id: I1002529b0c35852c67540d3165d1444523460592
* Merge "Fix CAS argument type."Hans Boehm2014-08-161-1/+1
|\
| * Fix CAS argument type.Hans Boehm2014-08-191-1/+1
| | | | | | | | | | | | | | Gcc apparently doesn't check; clang does. Bug:17067219 Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
* | Merge "Use gettid directly in binder."Elliott Hughes2014-08-161-1/+1
|\ \
| * | Use gettid directly in binder.Elliott Hughes2014-08-181-1/+1
| |/ | | | | | | | | Bug: 17048545 Change-Id: I1df378135961e085a52f6cc5694ad74cd73aac19
* | Merge "Disable verification based on vold.decrypt. [frameworks/native]"Brian Carlstrom2014-08-151-1/+1
|\ \ | |/ |/|
generated by cgit v1.1 at 2025-01-23 05:06:40 +0000