diff options
| author | Kenny Root <kroot@google.com> | 2013-10-01 17:48:03 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-10-01 17:49:42 -0700 |
| commit | bd99acf9781403874102f707e5bc9c21fb67f376 (patch) | |
| tree | 78f965f23691d20ffda940b559bae2952a8eb5f5 | |
| parent | 4d11667cd0e5b737c576128986fca03a226d08ee (diff) | |
| download | libcore-bd99acf9781403874102f707e5bc9c21fb67f376.zip libcore-bd99acf9781403874102f707e5bc9c21fb67f376.tar.gz libcore-bd99acf9781403874102f707e5bc9c21fb67f376.tar.bz2 | |
Conscrypt: fixing Android.mk dependencies
Remove some dependencies on makefile orders from other libcore files.
Change-Id: Iff62a2aebf3b58227fbe3157371c85c33f2db097
| -rw-r--r-- | crypto/Android.mk | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/crypto/Android.mk b/crypto/Android.mk index f40d15f..e2af290 100644 --- a/crypto/Android.mk +++ b/crypto/Android.mk @@ -98,10 +98,11 @@ LOCAL_CFLAGS += -DJNI_JARJAR_PREFIX="com/android/" LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_SRC_FILES := \ src/main/native/org_conscrypt_NativeCrypto.cpp -LOCAL_C_INCLUDES += $(core_c_includes) \ +LOCAL_C_INCLUDES += \ + external/openssl/include \ + libcore/include \ libcore/luni/src/main/native -LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libssl libnativehelper libz libjavacore -LOCAL_STATIC_LIBRARIES += $(core_static_libraries) +LOCAL_SHARED_LIBRARIES := libcrypto libjavacore liblog libnativehelper libssl libz LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacrypto LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -157,7 +158,9 @@ ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES += \ src/main/native/org_conscrypt_NativeCrypto.cpp - LOCAL_C_INCLUDES += $(core_c_includes) \ + LOCAL_C_INCLUDES += \ + external/openssl/include \ + libcore/include \ libcore/luni/src/main/native LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_LDLIBS += -lpthread @@ -165,22 +168,22 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_MODULE := libjavacrypto LOCAL_CFLAGS += -DJNI_JARJAR_PREFIX="com/android/" LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libssl-host libcrypto-host libjavacore - LOCAL_STATIC_LIBRARIES += $(core_static_libraries) + LOCAL_SHARED_LIBRARIES := libcrypto-host libjavacore liblog libnativehelper libssl-host include $(BUILD_HOST_SHARED_LIBRARY) # Conscrypt native library for nojarjar'd version include $(CLEAR_VARS) LOCAL_SRC_FILES += \ src/main/native/org_conscrypt_NativeCrypto.cpp - LOCAL_C_INCLUDES += $(core_c_includes) \ + LOCAL_C_INCLUDES += \ + external/openssl/include \ + libcore/include \ libcore/luni/src/main/native LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_LDLIBS += -lpthread LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libconscrypt_jni LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libssl-host libcrypto-host libjavacore - LOCAL_STATIC_LIBRARIES += $(core_static_libraries) + LOCAL_SHARED_LIBRARIES := libcrypto-host libjavacore libssl-host include $(BUILD_HOST_SHARED_LIBRARY) endif |