diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-05 18:34:09 +0200 |
| commit | 626c2706b1f7abdc6af1216873b7687e59025d1f (patch) | |
| tree | 0617ebb1e49364082071482aa9a977dd1da45940 /main/openssl/Apps-config-host.mk | |
| parent | 614b8790e5fc0bb3864eb2e3dd8c15016333d016 (diff) | |
Update OpenSSL to aosp/masterc0.6.13
--HG--
extra : rebase_source : a2f70c1a7529c7fcfc88f8dd1882e66e6ba42167
Diffstat (limited to 'main/openssl/Apps-config-host.mk')
| -rw-r--r-- | main/openssl/Apps-config-host.mk | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/main/openssl/Apps-config-host.mk b/main/openssl/Apps-config-host.mk index c1e5c6c5..37dcb78b 100644 --- a/main/openssl/Apps-config-host.mk +++ b/main/openssl/Apps-config-host.mk @@ -105,21 +105,15 @@ mips_src_files := mips_exclude_files := -ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) -ifneq ($(BUILD_HOST_64bit),) -host_arch := x86_64 -else -host_arch := x86 -endif -else -ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86_64) -host_arch := x86_64 +LOCAL_CFLAGS += $(common_cflags) +LOCAL_C_INCLUDES += $(common_c_includes) $(local_c_includes) + +ifeq ($(HOST_OS),linux) +LOCAL_CFLAGS_x86 += $(x86_cflags) +LOCAL_SRC_FILES_x86 += $(filter-out $(x86_exclude_files), $(common_src_files) $(x86_src_files)) +LOCAL_CFLAGS_x86_64 += $(x86_64_cflags) +LOCAL_SRC_FILES_x86_64 += $(filter-out $(x86_64_exclude_files), $(common_src_files) $(x86_64_src_files)) else -$(warning Unknown host architecture $(HOST_OS)-$(HOST_ARCH)) -host_arch := unknown -endif +$(warning Unknown host OS $(HOST_OS)) +LOCAL_SRC_FILES += $(common_src_files) endif - -LOCAL_CFLAGS += $(common_cflags) $($(host_arch)_cflags) -LOCAL_C_INCLUDES += $(common_c_includes) $(local_c_includes) -LOCAL_SRC_FILES += $(filter-out $($(host_arch)_exclude_files), $(common_src_files) $($(host_arch)_src_files)) |