diff options
| author | 2015-04-29 14:44:43 +0000 | |
|---|---|---|
| committer | 2015-04-29 14:44:43 +0000 | |
| commit | 40e183005ecf05938f27a9722f419e71bb0e4257 (patch) | |
| tree | 89168f24337d7ec41648568c48b0dd5fb5194c39 | |
| parent | abc574c14d86ab629d507da42155fa6ec125d7eb (diff) | |
| parent | 36ad3f1c3c08a49680a8f5d34bba43199ab9dd5b (diff) | |
am 36ad3f1c: Merge "Add dependency on libbase."
* commit '36ad3f1c3c08a49680a8f5d34bba43199ab9dd5b':
Add dependency on libbase.
| -rw-r--r-- | runtime/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 240799e97c..ece9d4b87a 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -468,7 +468,7 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT ifeq ($$(art_target_or_host),target) LOCAL_SHARED_LIBRARIES += libdl # ZipArchive support, the order matters here to get all symbols. - LOCAL_STATIC_LIBRARIES := libziparchive libz + LOCAL_STATIC_LIBRARIES := libziparchive libz libbase # For android::FileMap used by libziparchive. LOCAL_SHARED_LIBRARIES += libutils # For liblog, atrace, properties, ashmem, set_sched_policy and socket_peer_is_trusted. |