diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-17 05:14:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-17 05:14:59 +0000 |
| commit | 3b9cd89761260a80aed36d45aa61d847b20b81e6 (patch) | |
| tree | 53732924bf04214de329abf8b4a792e631ef254b | |
| parent | 64a6475701a6f1b185b6fdeafcbd2df866dfe187 (diff) | |
| parent | 19ba2abfd7fd9a05de49711aa5afa3c8e0694527 (diff) | |
| download | boringssl-3b9cd89761260a80aed36d45aa61d847b20b81e6.tar.gz | |
Merge "Trusty: update architecture source files for Trusty" am: 8e6bcab360 am: 19ba2abfd7
Change-Id: I050860b792d1dd72dfc5ad056fc6c398a299dbc6
| -rw-r--r-- | crypto-sources.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto-sources.mk b/crypto-sources.mk index 31c163fd..dac92837 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -5,8 +5,5 @@ include $(LOCAL_PATH)/sources.mk LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM LOCAL_ASFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter # Do not add in the architecture-specific files if we don't want to build assembly -LOCAL_SRC_FILES_x86 := $(linux_x86_sources) -LOCAL_SRC_FILES_x86_64 := $(linux_x86_64_sources) -LOCAL_SRC_FILES_arm := $(linux_arm_sources) -LOCAL_SRC_FILES_arm64 := $(linux_aarch64_sources) +LOCAL_SRC_FILES_$(ARCH) := $(linux_$(STANDARD_ARCH_NAME)_sources) LOCAL_SRC_FILES += $(crypto_sources) |