am a4c0b756: Merge "Add mkfifoat(3)."
* commit 'a4c0b7567190968d263bedd1073ea633510f9a45':
Add mkfifoat(3).
* commit 'a4c0b7567190968d263bedd1073ea633510f9a45':
Add mkfifoat(3).
am f33a7d7f: Merge "Fix mips build"
* commit 'f33a7d7f1cc96cf1445013fe49f6db0f03cbd44f':
Fix mips build
* commit 'f33a7d7f1cc96cf1445013fe49f6db0f03cbd44f':
Fix mips build
am 398eb5a7: Merge "Remove unnecessary lookups during relocations"
* commit '398eb5a7ee1f0f7173e463e82381431ef4b21a17':
Remove unnecessary lookups during relocations
* commit '398eb5a7ee1f0f7173e463e82381431ef4b21a17':
Remove unnecessary lookups during relocations
am 566f2bc6: Merge "Fix relocation to look for symbols in local group"
* commit '566f2bc623dbd1d6e8bcf3a6c6e7a6fffe7f68fd':
Fix relocation to look for symbols in local group
* commit '566f2bc623dbd1d6e8bcf3a6c6e7a6fffe7f68fd':
Fix relocation to look for symbols in local group
am 6c5694b6: Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."
* commit '6c5694b6c8343d740c36adbe904442cecd8030a6':
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
* commit '6c5694b6c8343d740c36adbe904442cecd8030a6':
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
Merge "[x86,x86_64] Fix libgcc unwinding through signal"
[x86,x86_64] Fix libgcc unwinding through signal
This change provides __restore/__restore_rt on x86 and __restore_rt on
x86_64 with unwinding information to be able to unwind through signal
frame via libgcc provided unwinding interface. See comments inlined for
more details.
Also remove the test that had a dependency on
__attribute__((cleanup(foo_cleanup))). It doesn't provide us with any
better test coverage than we have from the newer tests, and it doesn't
work well across a variety architectures (presumably because no one uses
this attribute in the real world).
Tested this on host via bionic-unit-tests-run-on-host on both x86 and
x86-64.
Bug: 17436734
Change-Id: I2f06814e82c8faa732cb4f5648868dc0fd2e5fe4
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
This change provides __restore/__restore_rt on x86 and __restore_rt on
x86_64 with unwinding information to be able to unwind through signal
frame via libgcc provided unwinding interface. See comments inlined for
more details.
Also remove the test that had a dependency on
__attribute__((cleanup(foo_cleanup))). It doesn't provide us with any
better test coverage than we have from the newer tests, and it doesn't
work well across a variety architectures (presumably because no one uses
this attribute in the real world).
Tested this on host via bionic-unit-tests-run-on-host on both x86 and
x86-64.
Bug: 17436734
Change-Id: I2f06814e82c8faa732cb4f5648868dc0fd2e5fe4
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Merge "pthread_setname_np appears in glibc 2.12."
pthread_setname_np appears in glibc 2.12.
And our emulator kernels are now new enough to not require a workaround.
Change-Id: Id56c983dbfd8abc69f72a78411a5502391941dfc
And our emulator kernels are now new enough to not require a workaround.
Change-Id: Id56c983dbfd8abc69f72a78411a5502391941dfc
Merge "Fix the type of u_ar0 in <sys/user.h>."
Merge "POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK."
Merge "Fix *tests-run-on-host target"
Fix *tests-run-on-host target
Change-Id: Id0e5060977a2df91c47b5a916989eb7e2e3f8153
Change-Id: Id0e5060977a2df91c47b5a916989eb7e2e3f8153
Fix the type of u_ar0 in <sys/user.h>.
Change-Id: I9332dea60f7c60b45bc80026686c266bfa7a782c
Change-Id: I9332dea60f7c60b45bc80026686c266bfa7a782c
POSIX says pthread_mutex_trylock returns EBUSY, not EDEADLK.
Found by unit test.
Change-Id: Iffbd2f04213616927fbd7b5419460031f7a078e9
Found by unit test.
Change-Id: Iffbd2f04213616927fbd7b5419460031f7a078e9
Merge "bionic tests: migrate test for mutex type from system/extras"
bionic tests: migrate test for mutex type from system/extras
Migrate the test about pthread mutex type in file
system/extras/tests/bionic/libc/bionic/test_mutex.c
to the new place
bionic/tests/pthread_test.cpp
in the gtest format.
Change-Id: I6aab10170ccad5b9a4892d52dba2403876c86659
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Migrate the test about pthread mutex type in file
system/extras/tests/bionic/libc/bionic/test_mutex.c
to the new place
bionic/tests/pthread_test.cpp
in the gtest format.
Change-Id: I6aab10170ccad5b9a4892d52dba2403876c86659
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Merge "Remove unnecessary reinterpret_cast"
Remove unnecessary reinterpret_cast
Change-Id: Id2ddf4e74bc66825206d1287f899d716537a68d0
Change-Id: Id2ddf4e74bc66825206d1287f899d716537a68d0
am cf8ea37f: Merge "bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests"
* commit 'cf8ea37fc91e23d37b3c5873b5e152ccae293f03':
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
* commit 'cf8ea37fc91e23d37b3c5873b5e152ccae293f03':
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
Merge "Disable clang compilation due to lack of ifunc."
Merge "Make the netdb unit tests work on the host."
Disable clang compilation due to lack of ifunc.
BUG: 18055309
Change-Id: I0f36011cf7872a20ddd36a6c3c607eb96f0a8ec2
BUG: 18055309
Change-Id: I0f36011cf7872a20ddd36a6c3c607eb96f0a8ec2
Make the netdb unit tests work on the host.
Bug: 18111005
Change-Id: I79c6929c3827716e19b44d7469db69740f4b449c
Bug: 18111005
Change-Id: I79c6929c3827716e19b44d7469db69740f4b449c
Merge "Use mxcr_mask instead of mxcsr_mask to match glibc."
am e516321d: Merge "Update bionic to tzdata2014i."
* commit 'e516321d78162479a4ce17bd5a9ba8c0834abf18':
Update bionic to tzdata2014i.
* commit 'e516321d78162479a4ce17bd5a9ba8c0834abf18':
Update bionic to tzdata2014i.
am efd2ec8f: Merge "Fix race condition in timer disarm/delete."
* commit 'efd2ec8fbddb99a7a2d7da8e1024655fa08153ca':
Fix race condition in timer disarm/delete.
* commit 'efd2ec8fbddb99a7a2d7da8e1024655fa08153ca':
Fix race condition in timer disarm/delete.
Use mxcr_mask instead of mxcsr_mask to match glibc.
Bug: 18097559
Change-Id: Iaca301d7d4c4902989d4699117f72b88d5c4bd78
Bug: 18097559
Change-Id: Iaca301d7d4c4902989d4699117f72b88d5c4bd78
Merge "Add mkfifoat(3)."
Add mkfifoat(3).
Looks like I missed one of the *at functions when I added the rest.
Change-Id: If16de82dbf6f9a3ea7bfdcba406ca1c74a3f2279
Looks like I missed one of the *at functions when I added the rest.
Change-Id: If16de82dbf6f9a3ea7bfdcba406ca1c74a3f2279
Merge "Fix mips build"
Merge "Remove unnecessary lookups during relocations"
Fix mips build
Change-Id: Ia2dc2e07740bdbb91ee92bfea459230015fcc99b
Change-Id: Ia2dc2e07740bdbb91ee92bfea459230015fcc99b
Remove unnecessary lookups during relocations
local_group includes this library and its dependencies.
Change-Id: Ib02474b2355bb147de3889f60092cb2f312997ef
local_group includes this library and its dependencies.
Change-Id: Ib02474b2355bb147de3889f60092cb2f312997ef
Merge "Fix relocation to look for symbols in local group"
Fix relocation to look for symbols in local group
The local group is a sequence of libraries in default (breadth-first)
order. It allows RTLD_LOCALLY loaded library to correctly relocate
symbols within its group (see test-cases).
Local group lookup is performed after main executable and ld_preloads.
Bug: 2643900
Bug: 15432753
Change-Id: I9bb013b46d17dbb5cbdfb8fef26f552748385541
The local group is a sequence of libraries in default (breadth-first)
order. It allows RTLD_LOCALLY loaded library to correctly relocate
symbols within its group (see test-cases).
Local group lookup is performed after main executable and ld_preloads.
Bug: 2643900
Bug: 15432753
Change-Id: I9bb013b46d17dbb5cbdfb8fef26f552748385541
Merge "Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3)."
Migrate system/extra getaddrinfo test, and fix a bug in getservbyname(3).
This change is to migrate the getaddrinfo tests defined in the old file
system/extras/tests/bionic/libc/common/test_getaddrinfo.c
to the new place bionic/tests/netdb_test.cpp.
The test here is more thorough, and catches a bug in getservbyname(3)
that was breaking getaddrinfo(3)'s ability to look up services by name
without a hint that would cause it to ask for a specific protocol.
Change-Id: Ief5ebd0869496d1bc6a97861dfefa04bdf24bab1
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
This change is to migrate the getaddrinfo tests defined in the old file
system/extras/tests/bionic/libc/common/test_getaddrinfo.c
to the new place bionic/tests/netdb_test.cpp.
The test here is more thorough, and catches a bug in getservbyname(3)
that was breaking getaddrinfo(3)'s ability to look up services by name
without a hint that would cause it to ask for a specific protocol.
Change-Id: Ief5ebd0869496d1bc6a97861dfefa04bdf24bab1
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Merge "bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests"
bionic/tests: migrate gethostbyname bionic test from system/extra to bionic/tests
this change migrate the gethostbyname test defined in the old file
system/extras/tests/bionic/libc/common/test_gethostbyname.c
to the new place bionic/tests/netdb_test.cpp
Change-Id: I342171090f681581fb54d68ea4a09adf61f52081
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
this change migrate the gethostbyname test defined in the old file
system/extras/tests/bionic/libc/common/test_gethostbyname.c
to the new place bionic/tests/netdb_test.cpp
Change-Id: I342171090f681581fb54d68ea4a09adf61f52081
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Merge "Update bionic to tzdata2014i."
Merge "Fix race condition in timer disarm/delete."
Fix race condition in timer disarm/delete.
When setting a repeat timer using the SIGEV_THREAD mechanism, it's possible
that the callback can be called after the timer is disarmed or deleted.
This happens because the kernel can generate signals that the timer thread
will continue to handle even after the timer is supposed to be off.
Add two new tests to verify that disarming/deleting doesn't continue to
call the callback.
Modify the repeat test to finish more quickly than before.
Refactor the Counter implementation a bit.
Bug: 18039727
(cherry pick from commit 0724132c3263145f2a667f453a199d313a5b3d9f)
Change-Id: I135726ea4038a47920a6c511708813b1a9996c42
When setting a repeat timer using the SIGEV_THREAD mechanism, it's possible
that the callback can be called after the timer is disarmed or deleted.
This happens because the kernel can generate signals that the timer thread
will continue to handle even after the timer is supposed to be off.
Add two new tests to verify that disarming/deleting doesn't continue to
call the callback.
Modify the repeat test to finish more quickly than before.
Refactor the Counter implementation a bit.
Bug: 18039727
(cherry pick from commit 0724132c3263145f2a667f453a199d313a5b3d9f)
Change-Id: I135726ea4038a47920a6c511708813b1a9996c42
Update bionic to tzdata2014i.
From the release notes:
Changes affecting future time stamps
Pacific/Fiji will observe DST from 2014-11-02 02:00 to
2015-01-18 03:00. (Thanks to Ken Rylander for the heads-up.)
Guess that future years will use a similar pattern.
A new Zone Pacific/Bougainville, for the part of Papua New
Guinea that plans to switch from UTC+10 to UTC+11 on
2014-12-28 at 02:00. (Thanks to Kiley Walbom for the
heads-up.)
Changes affecting time zone abbreviations
Since Belarus is not changing its clocks even though Moscow
is, the time zone abbreviation in Europe/Minsk is changing
from FET to its more-traditional value MSK on 2014-10-26 at
01:00. (Thanks to Alexander Bokovoy for the heads-up about
Belarus.)
The new abbreviation IDT stands for the pre-1976 use of UT+8
in Indochina, to distinguish it better from ICT (UT+7).
Changes affecting past time stamps
Many time stamps have been corrected for Asia/Ho_Chi_Minh
before 1976 (thanks to Trần Ngọc Quân for an indirect pointer
to Trần Tiến Bình's authoritative book). Asia/Ho_Chi_Minh has
been added to zone1970.tab, to give tzselect users in Vietnam
two choices, since north and south Vietnam disagreed after our
1970 cutoff.
Asia/Phnom_Penh and Asia/Vientiane have been turned into
links, as they differed from existing zones only for older
time stamps. As usual, these changes affect pre-1970 time
stamps only. Their old contents have been moved to the
'backzone' file.
Bug: 18085936
Change-Id: I89c065b4788b10ed7530cc4e8cfbc1b65c05c1b7
From the release notes:
Changes affecting future time stamps
Pacific/Fiji will observe DST from 2014-11-02 02:00 to
2015-01-18 03:00. (Thanks to Ken Rylander for the heads-up.)
Guess that future years will use a similar pattern.
A new Zone Pacific/Bougainville, for the part of Papua New
Guinea that plans to switch from UTC+10 to UTC+11 on
2014-12-28 at 02:00. (Thanks to Kiley Walbom for the
heads-up.)
Changes affecting time zone abbreviations
Since Belarus is not changing its clocks even though Moscow
is, the time zone abbreviation in Europe/Minsk is changing
from FET to its more-traditional value MSK on 2014-10-26 at
01:00. (Thanks to Alexander Bokovoy for the heads-up about
Belarus.)
The new abbreviation IDT stands for the pre-1976 use of UT+8
in Indochina, to distinguish it better from ICT (UT+7).
Changes affecting past time stamps
Many time stamps have been corrected for Asia/Ho_Chi_Minh
before 1976 (thanks to Trần Ngọc Quân for an indirect pointer
to Trần Tiến Bình's authoritative book). Asia/Ho_Chi_Minh has
been added to zone1970.tab, to give tzselect users in Vietnam
two choices, since north and south Vietnam disagreed after our
1970 cutoff.
Asia/Phnom_Penh and Asia/Vientiane have been turned into
links, as they differed from existing zones only for older
time stamps. As usual, these changes affect pre-1970 time
stamps only. Their old contents have been moved to the
'backzone' file.
Bug: 18085936
Change-Id: I89c065b4788b10ed7530cc4e8cfbc1b65c05c1b7
Merge "Replace ambiguous cmp operator with cmpl."
Replace ambiguous cmp operator with cmpl.
Clang assembler rejects ambiguous cmp instruction.
BUG: 17302482
Change-Id: Ie8dca7e4f46e0906c47076bba21c1941482ba6b3
Clang assembler rejects ambiguous cmp instruction.
BUG: 17302482
Change-Id: Ie8dca7e4f46e0906c47076bba21c1941482ba6b3
Merge "Rename library_offset to library_fd_offset"
Rename library_offset to library_fd_offset
replace lseek() and use pread() instead
add test for library_fd_offset > file_size case
Bug: 17762003
Change-Id: I4555f0be635124efe849c1f226985bcba72ffcbd
replace lseek() and use pread() instead
add test for library_fd_offset > file_size case
Bug: 17762003
Change-Id: I4555f0be635124efe849c1f226985bcba72ffcbd
Merge "Never use ASAN."
Never use ASAN.
Unless we completely redo how we build bionic (so that the object
files for libc.so get built separately from libc.a), we can't enable
ASAN here, as libc.a gets linked into static executables.
Change-Id: I2ce4f51248bd51c4213a555ff481b6faabbf53f8
Unless we completely redo how we build bionic (so that the object
files for libc.so get built separately from libc.a), we can't enable
ASAN here, as libc.a gets linked into static executables.
Change-Id: I2ce4f51248bd51c4213a555ff481b6faabbf53f8
am 8f41d3d3: Merge "Fix generic __memcpy_chk implementation."
* commit '8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
* commit '8f41d3d3bc7cf2375e5dd9202da619fd67a5928f':
Fix generic __memcpy_chk implementation.
Merge "Fix generic __memcpy_chk implementation."
am 9a740482: Merge "Add -no-integrated-as at local level."
* commit '9a7404824b3dfaad6ba14a41aab5f14132392a92':
Add -no-integrated-as at local level.
* commit '9a7404824b3dfaad6ba14a41aab5f14132392a92':
Add -no-integrated-as at local level.
Merge "Add -no-integrated-as at local level."
Add -no-integrated-as at local level.
Later we will enable integrated-as as default at the global level.
BUG: 17820427
BUG: 17302991
Change-Id: I233204ca04d7222b2cb1fbd0fa48a482f8b63f6f
Later we will enable integrated-as as default at the global level.
BUG: 17820427
BUG: 17302991
Change-Id: I233204ca04d7222b2cb1fbd0fa48a482f8b63f6f
Fix generic __memcpy_chk implementation.
- Clean up the labels (add .L to make them local).
- Change to using cfi directives.
- Fix unwinding of the __memcpy_chk fail path.
Bug: 18033671
Change-Id: I12845f10c7ce5e6699c15c558bda64c83f6a392a
- Clean up the labels (add .L to make them local).
- Change to using cfi directives.
- Fix unwinding of the __memcpy_chk fail path.
Bug: 18033671
Change-Id: I12845f10c7ce5e6699c15c558bda64c83f6a392a
am dec4de45: Merge "Correct way to specify additional dependencies"
* commit 'dec4de456c046881fb1e8c7c7d0c27a11ef09eb7':
Correct way to specify additional dependencies
* commit 'dec4de456c046881fb1e8c7c7d0c27a11ef09eb7':
Correct way to specify additional dependencies
Merge "Correct way to specify additional dependencies"
Correct way to specify additional dependencies
Previous one was not covering all the targets
Bug: 17548097
Change-Id: I425e0f8d6e5a43feabd29dcb327049b82754d249
Previous one was not covering all the targets
Bug: 17548097
Change-Id: I425e0f8d6e5a43feabd29dcb327049b82754d249
am 5281e1fb: Merge "Fix misleading comment."
* commit '5281e1fb15632c8dc714d10abc6cd1a22a061782':
Fix misleading comment.
* commit '5281e1fb15632c8dc714d10abc6cd1a22a061782':
Fix misleading comment.
Merge "Fix misleading comment."
am 90aa7e37: Merge "Only use <atomic> for C++11 and newer."
* commit '90aa7e374f9000577cde64c4fb88c5dab8dac62e':
Only use <atomic> for C++11 and newer.
* commit '90aa7e374f9000577cde64c4fb88c5dab8dac62e':
Only use <atomic> for C++11 and newer.
Merge "Only use <atomic> for C++11 and newer."
am 8bb12127: Merge "Don\'t use an STL for libm."
* commit '8bb12127e62c1fc4d9dc99ce9272008023c7c08e':
Don't use an STL for libm.
* commit '8bb12127e62c1fc4d9dc99ce9272008023c7c08e':
Don't use an STL for libm.
Merge "Don't use an STL for libm."
Only use <atomic> for C++11 and newer.
Any pre-C++11 clients of stdatomic.h that use libc++ are being forced
over to <atomic>, which they don't have the language support to use.
Change-Id: I62445c1f2541410a1569498c09433c7196635537
Any pre-C++11 clients of stdatomic.h that use libc++ are being forced
over to <atomic>, which they don't have the language support to use.
Change-Id: I62445c1f2541410a1569498c09433c7196635537
Don't use an STL for libm.
The default is none right now, but this will be needed when the
default becomes libc++.
Change-Id: Ib022adac2b9dc08fbfae830908128043cfffb91e
The default is none right now, but this will be needed when the
default becomes libc++.
Change-Id: Ib022adac2b9dc08fbfae830908128043cfffb91e
am f5e02582: Merge "Ignore DT_BIND_NOW (0x18)"
* commit 'f5e0258268b45faa4d84de34047660061720abc7':
Ignore DT_BIND_NOW (0x18)
* commit 'f5e0258268b45faa4d84de34047660061720abc7':
Ignore DT_BIND_NOW (0x18)
Merge "Ignore DT_BIND_NOW (0x18)"
Fix misleading comment.
Change-Id: I9e2aa6c2ba938c8f8d7c74eba32d313c866c77b2
Change-Id: I9e2aa6c2ba938c8f8d7c74eba32d313c866c77b2
am 71cbcdcf: Merge "We don\'t actually need all of libc++ here."
* commit '71cbcdcf947835076241b9dd72099f28997eb290':
We don't actually need all of libc++ here.
* commit '71cbcdcf947835076241b9dd72099f28997eb290':
We don't actually need all of libc++ here.
Merge "We don't actually need all of libc++ here."
We don't actually need all of libc++ here.
All we're actually interested in is the unwinder. Since that's now a
separate library, just use that.
Change-Id: If86071a0d850da961336a58147b70369ace7bd12
All we're actually interested in is the unwinder. Since that's now a
separate library, just use that.
Change-Id: If86071a0d850da961336a58147b70369ace7bd12
am 97df16ba: Merge "Add clock_settime and clock_nanosleep."
* commit '97df16ba5c2911e06d1211781a5724706abd227b':
Add clock_settime and clock_nanosleep.
* commit '97df16ba5c2911e06d1211781a5724706abd227b':
Add clock_settime and clock_nanosleep.
Merge "Add clock_settime and clock_nanosleep."
Add clock_settime and clock_nanosleep.
Add the missing prototypes, fix the existing prototypes to use clockid_t
rather than int, fix clock_nanosleep's failure behavior, and add simple
tests.
Bug: 17644443
Bug: https://code.google.com/p/android/issues/detail?id=77372
Change-Id: I03fba369939403918abcabae9551a7123953d780
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
Add the missing prototypes, fix the existing prototypes to use clockid_t
rather than int, fix clock_nanosleep's failure behavior, and add simple
tests.
Bug: 17644443
Bug: https://code.google.com/p/android/issues/detail?id=77372
Change-Id: I03fba369939403918abcabae9551a7123953d780
Signed-off-by: Haruki Hasegawa <h6a.h4i.0@gmail.com>
am c2297050: Merge "Add glibc alias for NT_PRFPREG"
* commit 'c229705051c8b6a06ad81c221ca74ef9aa743e13':
Add glibc alias for NT_PRFPREG
* commit 'c229705051c8b6a06ad81c221ca74ef9aa743e13':
Add glibc alias for NT_PRFPREG
am 083769a3: Merge "Return total footprint, not high water mark."
* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
Return total footprint, not high water mark.
* commit '083769a3dffabfb968a03a700b9f2fd7838bcf75':
Return total footprint, not high water mark.
am 94571f9a: Merge "Use LOCAL_CXX_STL to select libc++_static."
* commit '94571f9ade03cfe24bff1bddc4d6c1a320b39b8e':
Use LOCAL_CXX_STL to select libc++_static.
* commit '94571f9ade03cfe24bff1bddc4d6c1a320b39b8e':
Use LOCAL_CXX_STL to select libc++_static.
Merge "Add glibc alias for NT_PRFPREG"
Add glibc alias for NT_PRFPREG
Also fix comment style for DF_1_ constants
Change-Id: I7c3ed1d834f0a2b85ee8cc8016c79020955084f8
Also fix comment style for DF_1_ constants
Change-Id: I7c3ed1d834f0a2b85ee8cc8016c79020955084f8
Merge "Return total footprint, not high water mark."
Return total footprint, not high water mark.
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.
Bug: 17265653
(cherry pick from commit f4ada9c9ce31c7e56146a4cb703747385bc043a5)
Change-Id: I2fba10285859dccfe8331063c9be14cc169f2d91
The mallinfo usmblks value returned by dlmalloc is a little misleading.
It's not the current max, it's the historical high water mark. This
leads to dumpsys meminfo producing native memory numbers that don't add up.
Change this to the real total footprint, not this high water mark.
Bug: 17265653
(cherry pick from commit f4ada9c9ce31c7e56146a4cb703747385bc043a5)
Change-Id: I2fba10285859dccfe8331063c9be14cc169f2d91
Merge "Use LOCAL_CXX_STL to select libc++_static."
Use LOCAL_CXX_STL to select libc++_static.
Directly adding the library to LOCAL_STATIC_LIBRARIES thwarts a few
build system checks.
Change-Id: Ib23c43badfa85de21c691f79ccdcc2cbe2a89b33
Directly adding the library to LOCAL_STATIC_LIBRARIES thwarts a few
build system checks.
Change-Id: Ib23c43badfa85de21c691f79ccdcc2cbe2a89b33
am 4c086247: Merge "Fix some formatting so GitHub displays it nicely."
* commit '4c0862474e63b09c901d11de47a318ce73a0c686':
Fix some formatting so GitHub displays it nicely.
* commit '4c0862474e63b09c901d11de47a318ce73a0c686':
Fix some formatting so GitHub displays it nicely.
Merge "Fix some formatting so GitHub displays it nicely."
Fix some formatting so GitHub displays it nicely.
Change-Id: Id6ce9a61bebd98544c85e5780147715c73d0e78b
Change-Id: Id6ce9a61bebd98544c85e5780147715c73d0e78b
am 8c3901b2: Merge "Improve documentation for testing and coverage."
* commit '8c3901b2999e6821b8ee984193352ba45b003492':
Improve documentation for testing and coverage.
* commit '8c3901b2999e6821b8ee984193352ba45b003492':
Improve documentation for testing and coverage.
Merge "Improve documentation for testing and coverage."
Improve documentation for testing and coverage.
Also rename HACKING.txt to README.md so it will display on the GitHub
mirror.
Change-Id: I70157a4ad262700212bf9afd87253d195c7013a9
Also rename HACKING.txt to README.md so it will display on the GitHub
mirror.
Change-Id: I70157a4ad262700212bf9afd87253d195c7013a9
am 2698f9ef: Merge "Catch up on upstream\'s round/roundf/roundl."
* commit '2698f9ef8412011295702cd6df4b66e01cf6c220':
Catch up on upstream's round/roundf/roundl.
* commit '2698f9ef8412011295702cd6df4b66e01cf6c220':
Catch up on upstream's round/roundf/roundl.
Merge "Catch up on upstream's round/roundf/roundl."
Catch up on upstream's round/roundf/roundl.
Not sure how we missed these, but better late than never...
Change-Id: Ib08d1bb6e340a1907cbeb1cbe220e33f70642bdc
Not sure how we missed these, but better late than never...
Change-Id: Ib08d1bb6e340a1907cbeb1cbe220e33f70642bdc
am c891e240: Add back symbols to fix Greed for Glory franchise.
* commit 'c891e24073830e07ba7373dee554ff2c70e1d313':
Add back symbols to fix Greed for Glory franchise.
* commit 'c891e24073830e07ba7373dee554ff2c70e1d313':
Add back symbols to fix Greed for Glory franchise.
am 62a665a6: Merge "Add back symbols to fix Greed for Glory franchise."
* commit '62a665a605df64a6ea5ac680bb564ad7a5f03711':
Add back symbols to fix Greed for Glory franchise.
* commit '62a665a605df64a6ea5ac680bb564ad7a5f03711':
Add back symbols to fix Greed for Glory franchise.
Merge "Add back symbols to fix Greed for Glory franchise."
Add back symbols to fix Greed for Glory franchise.
Bug: 17813018
(cherry picked from commit c891e24073830e07ba7373dee554ff2c70e1d313)
Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153
Bug: 17813018
(cherry picked from commit c891e24073830e07ba7373dee554ff2c70e1d313)
Change-Id: I4e891c2dbad9ea00d2377c5175317d9ae3840153