OSDN Git Service
(root)
/
android-x86
/
bionic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a626e4d
811b0cd
)
Merge commit '811b0cdb2d6e4a697dbc63a678712759dd0db242' into HEAD
author
The Android Open Source Project
<initial-contribution@android.com>
Fri, 22 Nov 2013 19:08:12 +0000
(11:08 -0800)
committer
Conley Owens
<cco3@android.com>
Fri, 22 Nov 2013 21:38:33 +0000
(13:38 -0800)
Change-Id: I786944f80fb1a2d502fed51dc2c391ed5db66761
1
2
libc/Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
libc/arch-arm/cortex-a15/bionic/memcpy_base.S
patch
|
diff1
|
diff2
|
blob
|
history
libc/arch-arm/krait/bionic/memcpy.S
patch
|
diff1
|
diff2
|
blob
|
history
tests/system_properties_test.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libc/Android.mk
index
af96503
,
770fbde
..
962365e
---
1
/
libc/Android.mk
---
2
/
libc/Android.mk
+++ b/
libc/Android.mk
@@@
-102,8
-104,13
+102,9
@@@
libc_common_src_files :=
bionic/md5.c \
bionic/memmem.c \
bionic/memswap.c \
- bionic/openat.c \
- bionic/open.c \
+ bionic/name_mem.c \
bionic/pathconf.c \
bionic/perror.c \
- bionic/pread.c \
- bionic/pselect.c \
bionic/ptsname.c \
bionic/ptsname_r.c \
bionic/pututline.c \
diff --cc
libc/arch-arm/cortex-a15/bionic/memcpy_base.S
Simple merge
diff --cc
libc/arch-arm/krait/bionic/memcpy.S
Simple merge
diff --cc
tests/system_properties_test.cpp
Simple merge