OSDN Git Service
(root)
/
android-x86
/
libcore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
478f5f9
de1d225
)
Resolved conflicts for merge of de1d2252 to master
author
Joe Onorato
<joeo@android.com>
Thu, 15 Jul 2010 18:24:40 +0000
(11:24 -0700)
committer
Joe Onorato
<joeo@android.com>
Thu, 15 Jul 2010 18:24:40 +0000
(11:24 -0700)
Change-Id: If44e4cfa8df812bceb8f39d9343530824cbf3b7c
1
2
luni/src/main/native/sub.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
luni/src/main/native/sub.mk
index
73ceedb
,
f0287cf
..
e9240a9
---
1
/
luni/src/main/native/sub.mk
---
2
/
luni/src/main/native/sub.mk
+++ b/
luni/src/main/native/sub.mk
@@@
-62,16
-28,7
+62,15
@@@
LOCAL_C_INCLUDES +=
# be listed in libs/nativehelper/Android.mk.
# TODO: fix this requirement
-LOCAL_SHARED_LIBRARIES += libutils
+LOCAL_SHARED_LIBRARIES += \
+ libcrypto \
+ libcutils \
+ libexpat \
- libicudata \
+ libicuuc \
+ libicui18n \
+ libssl \
+ libutils \
+ libz
LOCAL_STATIC_LIBRARIES += \
libfdlibm