diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 21:31:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 21:31:33 +0000 |
| commit | 45670c1dc55c3d853c03a252623428aeffa731e7 (patch) | |
| tree | f8aea770e319fae0b46673fe55e127aed8ef7be4 /packages/services | |
| parent | a41f29cc000680f402d51972dfad0a46c5a3cb07 (diff) | |
| parent | b28ff487fb6db4a44e4d18aa17d8253f00a63bb6 (diff) | |
| download | frameworks_base-45670c1dc55c3d853c03a252623428aeffa731e7.zip frameworks_base-45670c1dc55c3d853c03a252623428aeffa731e7.tar.gz frameworks_base-45670c1dc55c3d853c03a252623428aeffa731e7.tar.bz2 | |
am b28ff487: resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
* commit 'b28ff487fb6db4a44e4d18aa17d8253f00a63bb6':
Move frameworks/base over to libc++.
Diffstat (limited to 'packages/services')
| -rw-r--r-- | packages/services/PacProcessor/jni/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/packages/services/PacProcessor/jni/Android.mk b/packages/services/PacProcessor/jni/Android.mk index f16c90b..26c56c9 100644 --- a/packages/services/PacProcessor/jni/Android.mk +++ b/packages/services/PacProcessor/jni/Android.mk @@ -36,6 +36,4 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE := libjni_pacprocessor LOCAL_MODULE_TAGS := optional -include external/stlport/libstlport.mk - include $(BUILD_SHARED_LIBRARY) |