diff options
| author | Kenny Root <kroot@google.com> | 2015-11-06 23:09:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-06 23:09:21 +0000 |
| commit | 80fae8d6b0e7ecad66ffb06a4a1e38df3963e59b (patch) | |
| tree | 8e9624275d4a5532610b39502892481ebde0a73d | |
| parent | 30217ab4bfb9ab256cf52e478c39af1b50e178db (diff) | |
| parent | 5ecc91b54450efdebb6ffd0c0831613d82076a0f (diff) | |
| download | external_boringssl-80fae8d6b0e7ecad66ffb06a4a1e38df3963e59b.zip external_boringssl-80fae8d6b0e7ecad66ffb06a4a1e38df3963e59b.tar.gz external_boringssl-80fae8d6b0e7ecad66ffb06a4a1e38df3963e59b.tar.bz2 | |
Merge changes I49931c6e,Ia906bc8e,I6a663f00
am: 5ecc91b544
* commit '5ecc91b54450efdebb6ffd0c0831613d82076a0f':
trusty: Build boringssl as a .a instead of .o
trusty: Remove lib/libc-trusty from dependency list.
Fix trusty build warnings about duplicate files
| -rw-r--r-- | rules.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -20,12 +20,15 @@ LOCAL_PATH := $(GET_LOCAL_DIR) MODULE := $(LOCAL_DIR) +MODULE_STATIC_LIB := true + TARGET_ARCH := $(ARCH) TARGET_2ND_ARCH := $(ARCH) # Reset local variables LOCAL_CFLAGS := LOCAL_C_INCLUDES := +LOCAL_SRC_FILES := LOCAL_SRC_FILES_$(TARGET_ARCH) := LOCAL_SRC_FILES_$(TARGET_2ND_ARCH) := LOCAL_CFLAGS_$(TARGET_ARCH) := @@ -65,6 +68,5 @@ GLOBAL_INCLUDES += $(addprefix $(LOCAL_DIR)/,$(LOCAL_C_INCLUDES)) MODULE_DEPS := \ lib/openssl-stubs \ - lib/libc-trusty include make/module.mk |