diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-05-01 21:53:49 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-05-01 22:53:18 -0700 |
| commit | e5475cd77237e54ef7d8210c4858a341f54b9630 (patch) | |
| tree | b90dab0cfa18f806dbb6509d1eeca1b52667725f | |
| parent | 6e3adcc6036858531ec41bea8b2ca3b9980d6413 (diff) | |
| download | android_dalvik-e5475cd77237e54ef7d8210c4858a341f54b9630.tar.gz android_dalvik-e5475cd77237e54ef7d8210c4858a341f54b9630.tar.bz2 android_dalvik-e5475cd77237e54ef7d8210c4858a341f54b9630.zip | |
Tracking changes to *-host for host shared libraries
Change-Id: I764889011cc259cdca306e2145bcc4c8c75eced5
| -rw-r--r-- | dalvikvm/Android.mk | 2 | ||||
| -rw-r--r-- | dexopt/Android.mk | 11 | ||||
| -rw-r--r-- | vm/Android.mk | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 734f6f55b..9f6432941 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -64,7 +64,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_LDLIBS := -lffi -lssl -lcrypto -lz else LOCAL_LDLIBS += -ldl -lpthread - LOCAL_SHARED_LIBRARIES += libdvm libcrypto libicuuc libicui18n libssl + LOCAL_SHARED_LIBRARIES += libdvm libcrypto-host libicuuc-host libicui18n-host libssl-host endif LOCAL_MODULE_TAGS := optional diff --git a/dexopt/Android.mk b/dexopt/Android.mk index 81fa1c870..256dcbd3f 100644 --- a/dexopt/Android.mk +++ b/dexopt/Android.mk @@ -27,13 +27,6 @@ local_c_includes := \ dalvik/vm \ $(JNI_H_INCLUDE) -local_shared_libraries := \ - libssl \ - libdvm \ - libcrypto \ - libicuuc \ - libicui18n - include $(CLEAR_VARS) ifeq ($(TARGET_CPU_SMP),true) LOCAL_CFLAGS += -DANDROID_SMP=1 @@ -43,7 +36,7 @@ endif LOCAL_SRC_FILES := $(local_src_files) LOCAL_C_INCLUDES := $(local_c_includes) -LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) libcutils libexpat liblog libz +LOCAL_SHARED_LIBRARIES := libssl libdvm libcrypto libicuuc libicui18n libcutils libexpat liblog libz LOCAL_MODULE_TAGS := optional LOCAL_MODULE := dexopt @@ -56,7 +49,7 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(local_src_files) LOCAL_C_INCLUDES := $(local_c_includes) - LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) + LOCAL_SHARED_LIBRARIES := libssl-host libdvm libcrypto-host libicuuc-host libicui18n-host LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libz LOCAL_LDLIBS += -ldl -lpthread LOCAL_CFLAGS += -DANDROID_SMP=1 diff --git a/vm/Android.mk b/vm/Android.mk index 0af62e8d2..774dde708 100644 --- a/vm/Android.mk +++ b/vm/Android.mk @@ -109,7 +109,7 @@ ifeq ($(WITH_HOST_DALVIK),true) WITH_JIT := true include $(LOCAL_PATH)/Dvm.mk - LOCAL_SHARED_LIBRARIES += libcrypto libssl libicuuc libicui18n + LOCAL_SHARED_LIBRARIES += libcrypto-host libssl-host libicuuc-host libicui18n-host LOCAL_LDLIBS := -lpthread -ldl ifeq ($(HOST_OS),linux) |