Migrate from Android.mk to Android.bp
Change-Id: I0b04100ace8599c8734bee77f656aab04c06cce9
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..b611429
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,196 @@
+// Note that some host libraries have the same module name as the target
+// libraries. This is currently needed to build, for example, adb. But it's
+// probably something that should be changed.
+
+// Pull in the autogenerated sources modules
+build = ["sources.bp"]
+
+// Used by libcrypto, libssl, bssl tool, and native tests
+cc_defaults {
+ name: "boringssl_flags",
+
+ cflags: [
+ "-fvisibility=hidden",
+ "-DBORINGSSL_SHARED_LIBRARY",
+ "-DBORINGSSL_IMPLEMENTATION",
+ "-DOPENSSL_SMALL",
+ "-D_XOPEN_SOURCE=700",
+ "-Wno-unused-parameter",
+ ],
+
+ cppflags: [
+ "-Wall",
+ "-Werror",
+ ],
+
+ conlyflags: ["-std=c99"],
+}
+
+// Used by libcrypto + libssl
+cc_defaults {
+ name: "boringssl_defaults",
+
+ local_include_dirs: ["src/include"],
+ export_include_dirs: ["src/include"],
+ stl: "none",
+ sdk_version: "9",
+
+ cflags: ["-DBORINGSSL_ANDROID_SYSTEM"],
+}
+
+//// libcrypto
+
+cc_defaults {
+ name: "libcrypto_defaults",
+ host_supported: true,
+
+ // Windows and Macs both have problems with assembly files
+ target: {
+ windows: {
+ enabled: true,
+ cflags: ["-DOPENSSL_NO_ASM"],
+ host_ldlibs: ["-lws2_32"],
+ },
+ darwin: {
+ cflags: ["-DOPENSSL_NO_ASM"],
+ },
+ not_windows: {
+ host_ldlibs: ["-lpthread"],
+ },
+ },
+
+ local_include_dirs: ["src/crypto"],
+
+ // sha256-armv4.S does not compile with clang.
+ arch: {
+ arm: {
+ clang_asflags: ["-no-integrated-as"],
+ },
+ arm64: {
+ clang_asflags: ["-march=armv8-a+crypto"],
+ },
+ },
+}
+
+// Target and host library
+cc_library {
+ name: "libcrypto",
+ defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"],
+
+ // Shared host library is disabled until all users use libcrypto instead of libcrypto-host
+ target: {
+ host: {
+ shared: {
+ enabled: false,
+ },
+ },
+ },
+}
+
+// Static library
+// This should only be used for host modules that will be in a JVM, all other
+// modules should use the static variant of libcrypto.
+cc_library_static {
+ name: "libcrypto_static",
+ defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"],
+
+ target: {
+ host: {
+ // TODO: b/26097626. ASAN breaks use of this library in JVM.
+ // Re-enable sanitization when the issue with making clients of this library
+ // preload ASAN runtime is resolved. Without that, clients are getting runtime
+ // errors due to unresoled ASAN symbols, such as
+ // __asan_option_detect_stack_use_after_return.
+ sanitize: {
+ never: true,
+ },
+ },
+ },
+}
+
+// Host shared library
+cc_library_host_shared {
+ name: "libcrypto-host",
+ defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"],
+}
+
+//// libssl
+
+// Target static library
+// Deprecated: all users should move to libssl
+cc_library_static {
+ name: "libssl_static",
+ defaults: ["libssl_sources", "boringssl_defaults", "boringssl_flags"],
+}
+
+// Static and Shared library
+cc_library {
+ name: "libssl",
+ host_supported: true,
+ defaults: ["libssl_sources", "boringssl_defaults", "boringssl_flags"],
+
+ // Shared host library is disabled until all users use libssl instead of libssl-host
+ target: {
+ android: {
+ shared_libs: ["libcrypto"],
+ },
+ host: {
+ shared_libs: ["libcrypto-host"],
+
+ shared: {
+ enabled: false,
+ },
+ },
+ },
+}
+
+// Host static library
+cc_library_host_static {
+ name: "libssl_static-host",
+ defaults: ["libssl_sources", "boringssl_defaults", "boringssl_flags"],
+
+ // TODO: b/26097626. ASAN breaks use of this library in JVM.
+ // Re-enable sanitization when the issue with making clients of this library
+ // preload ASAN runtime is resolved. Without that, clients are getting runtime
+ // errors due to unresoled ASAN symbols, such as
+ // __asan_option_detect_stack_use_after_return.
+ sanitize: {
+ never: true,
+ },
+}
+
+// Host shared library
+cc_library_host_shared {
+ name: "libssl-host",
+ defaults: ["libssl_sources", "boringssl_defaults", "boringssl_flags"],
+
+ shared_libs: ["libcrypto-host"],
+}
+
+// Tool
+cc_binary {
+ name: "bssl",
+ host_supported: true,
+ defaults: ["bssl_sources", "boringssl_flags"],
+
+ target: {
+ android: {
+ shared_libs: [
+ "libcrypto",
+ "libssl",
+ ],
+ },
+ host: {
+ shared_libs: [
+ "libcrypto-host",
+ "libssl-host",
+ ],
+
+ // Needed for clock_gettime.
+ host_ldlibs: ["-lrt"],
+ },
+ darwin: {
+ enabled: false,
+ },
+ },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 0533986..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,192 +0,0 @@
-# Note that some host libraries have the same module name as the target
-# libraries. This is currently needed to build, for example, adb. But it's
-# probably something that should be changed.
-
-LOCAL_PATH := $(call my-dir)
-
-boringssl_cflags := \
- -fvisibility=hidden \
- -DBORINGSSL_SHARED_LIBRARY \
- -DBORINGSSL_IMPLEMENTATION \
- -DOPENSSL_SMALL \
- -D_XOPEN_SOURCE=700 \
- -Wno-unused-parameter
-
-boringssl_cppflags := \
- -Wall \
- -Werror
-
-boringssl_conlyflags := \
- -std=c99
-
-## libcrypto
-
-# Target static library
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libcrypto_static
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
-LOCAL_SDK_VERSION := 9
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-# sha256-armv4.S does not compile with clang.
-LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
-LOCAL_CLANG_ASFLAGS_arm64 += -march=armv8-a+crypto
-include $(LOCAL_PATH)/crypto-sources.mk
-include $(BUILD_STATIC_LIBRARY)
-
-# Target shared library
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libcrypto
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
-LOCAL_SDK_VERSION := 9
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-# sha256-armv4.S does not compile with clang.
-LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
-LOCAL_CLANG_ASFLAGS_arm64 += -march=armv8-a+crypto
-include $(LOCAL_PATH)/crypto-sources.mk
-include $(BUILD_SHARED_LIBRARY)
-
-# Target static tool
-include $(CLEAR_VARS)
-LOCAL_CPP_EXTENSION := cc
-LOCAL_MODULE := bssl
-LOCAL_MODULE_TAGS := optional
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-LOCAL_SHARED_LIBRARIES=libcrypto libssl
-include $(LOCAL_PATH)/sources.mk
-LOCAL_SRC_FILES = $(tool_sources)
-include $(BUILD_EXECUTABLE)
-
-# Host static library
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := libcrypto_static
-LOCAL_MODULE_HOST_OS := darwin linux windows
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-LOCAL_CXX_STL := none
-# Windows and Macs both have problems with assembly files
-LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM
-LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM
-# TODO: b/26097626. ASAN breaks use of this library in JVM.
-# Re-enable sanitization when the issue with making clients of this library
-# preload ASAN runtime is resolved. Without that, clients are getting runtime
-# errors due to unresoled ASAN symbols, such as
-# __asan_option_detect_stack_use_after_return.
-LOCAL_SANITIZE := never
-include $(LOCAL_PATH)/crypto-sources.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Host shared library
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE := libcrypto-host
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_MULTILIB := both
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-# Windows and Macs both have problems with assembly files
-LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM
-LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM
-LOCAL_LDLIBS_darwin := -lpthread
-LOCAL_LDLIBS_linux := -lpthread
-LOCAL_CXX_STL := none
-include $(LOCAL_PATH)/crypto-sources.mk
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-
-## libssl
-
-# Target static library
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libssl_static
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk
-LOCAL_SDK_VERSION := 9
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-include $(LOCAL_PATH)/ssl-sources.mk
-include $(BUILD_STATIC_LIBRARY)
-
-# Target shared library
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libssl
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-LOCAL_SHARED_LIBRARIES=libcrypto
-LOCAL_SDK_VERSION := 9
-include $(LOCAL_PATH)/ssl-sources.mk
-include $(BUILD_SHARED_LIBRARY)
-
-# Host static library
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libssl_static-host
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-LOCAL_CXX_STL := none
-# TODO: b/26097626. ASAN breaks use of this library in JVM.
-# Re-enable sanitization when the issue with making clients of this library
-# preload ASAN runtime is resolved. Without that, clients are getting runtime
-# errors due to unresoled ASAN symbols, such as
-# __asan_option_detect_stack_use_after_return.
-LOCAL_SANITIZE := never
-include $(LOCAL_PATH)/ssl-sources.mk
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Host static tool (for linux only).
-ifeq ($(HOST_OS), linux)
-include $(CLEAR_VARS)
-LOCAL_CPP_EXTENSION := cc
-LOCAL_MODULE := bssl
-LOCAL_MODULE_TAGS := optional
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-LOCAL_SHARED_LIBRARIES=libcrypto-host libssl-host
-# Needed for clock_gettime.
-LOCAL_LDFLAGS := -lrt
-include $(LOCAL_PATH)/sources.mk
-LOCAL_SRC_FILES = $(tool_sources)
-include $(BUILD_HOST_EXECUTABLE)
-endif # HOST_OS == linux
-
-# Host shared library
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libssl-host
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
-LOCAL_MULTILIB := both
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk
-LOCAL_CFLAGS := $(boringssl_cflags)
-LOCAL_CPPFLAGS := $(boringssl_cppflags)
-LOCAL_CONLYFLAGS := $(boringssl_conlyflags)
-LOCAL_CXX_STL := none
-LOCAL_SHARED_LIBRARIES += libcrypto-host
-include $(LOCAL_PATH)/ssl-sources.mk
-include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/crypto-sources.mk b/crypto-sources.mk
index a5b8ba3..31c163f 100644
--- a/crypto-sources.mk
+++ b/crypto-sources.mk
@@ -1,16 +1,12 @@
+# Now used only by Trusty
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk
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
-ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources)
-LOCAL_SRC_FILES_linux_x86_64 := $(linux_x86_64_sources)
-else
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)
-endif
LOCAL_SRC_FILES += $(crypto_sources)
diff --git a/sources.bp b/sources.bp
new file mode 100644
index 0000000..a634a27
--- /dev/null
+++ b/sources.bp
@@ -0,0 +1,460 @@
+// Copyright (C) 2015 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file is created by generate_build_files.py. Do not edit manually.
+
+cc_defaults {
+ name: "libcrypto_sources",
+ srcs: [
+ "android_compat_hacks.c",
+ "android_compat_keywrap.c",
+ "err_data.c",
+ "src/crypto/aes/aes.c",
+ "src/crypto/aes/mode_wrappers.c",
+ "src/crypto/asn1/a_bitstr.c",
+ "src/crypto/asn1/a_bool.c",
+ "src/crypto/asn1/a_bytes.c",
+ "src/crypto/asn1/a_d2i_fp.c",
+ "src/crypto/asn1/a_dup.c",
+ "src/crypto/asn1/a_enum.c",
+ "src/crypto/asn1/a_gentm.c",
+ "src/crypto/asn1/a_i2d_fp.c",
+ "src/crypto/asn1/a_int.c",
+ "src/crypto/asn1/a_mbstr.c",
+ "src/crypto/asn1/a_object.c",
+ "src/crypto/asn1/a_octet.c",
+ "src/crypto/asn1/a_print.c",
+ "src/crypto/asn1/a_strnid.c",
+ "src/crypto/asn1/a_time.c",
+ "src/crypto/asn1/a_type.c",
+ "src/crypto/asn1/a_utctm.c",
+ "src/crypto/asn1/a_utf8.c",
+ "src/crypto/asn1/asn1_lib.c",
+ "src/crypto/asn1/asn1_par.c",
+ "src/crypto/asn1/asn_pack.c",
+ "src/crypto/asn1/bio_asn1.c",
+ "src/crypto/asn1/bio_ndef.c",
+ "src/crypto/asn1/f_enum.c",
+ "src/crypto/asn1/f_int.c",
+ "src/crypto/asn1/f_string.c",
+ "src/crypto/asn1/t_bitst.c",
+ "src/crypto/asn1/tasn_dec.c",
+ "src/crypto/asn1/tasn_enc.c",
+ "src/crypto/asn1/tasn_fre.c",
+ "src/crypto/asn1/tasn_new.c",
+ "src/crypto/asn1/tasn_prn.c",
+ "src/crypto/asn1/tasn_typ.c",
+ "src/crypto/asn1/tasn_utl.c",
+ "src/crypto/asn1/x_bignum.c",
+ "src/crypto/asn1/x_long.c",
+ "src/crypto/base64/base64.c",
+ "src/crypto/bio/bio.c",
+ "src/crypto/bio/bio_mem.c",
+ "src/crypto/bio/buffer.c",
+ "src/crypto/bio/connect.c",
+ "src/crypto/bio/fd.c",
+ "src/crypto/bio/file.c",
+ "src/crypto/bio/hexdump.c",
+ "src/crypto/bio/pair.c",
+ "src/crypto/bio/printf.c",
+ "src/crypto/bio/socket.c",
+ "src/crypto/bio/socket_helper.c",
+ "src/crypto/bn/add.c",
+ "src/crypto/bn/asm/x86_64-gcc.c",
+ "src/crypto/bn/bn.c",
+ "src/crypto/bn/bn_asn1.c",
+ "src/crypto/bn/cmp.c",
+ "src/crypto/bn/convert.c",
+ "src/crypto/bn/ctx.c",
+ "src/crypto/bn/div.c",
+ "src/crypto/bn/exponentiation.c",
+ "src/crypto/bn/gcd.c",
+ "src/crypto/bn/generic.c",
+ "src/crypto/bn/kronecker.c",
+ "src/crypto/bn/montgomery.c",
+ "src/crypto/bn/mul.c",
+ "src/crypto/bn/prime.c",
+ "src/crypto/bn/random.c",
+ "src/crypto/bn/rsaz_exp.c",
+ "src/crypto/bn/shift.c",
+ "src/crypto/bn/sqrt.c",
+ "src/crypto/buf/buf.c",
+ "src/crypto/bytestring/asn1_compat.c",
+ "src/crypto/bytestring/ber.c",
+ "src/crypto/bytestring/cbb.c",
+ "src/crypto/bytestring/cbs.c",
+ "src/crypto/chacha/chacha.c",
+ "src/crypto/cipher/aead.c",
+ "src/crypto/cipher/cipher.c",
+ "src/crypto/cipher/derive_key.c",
+ "src/crypto/cipher/e_aes.c",
+ "src/crypto/cipher/e_chacha20poly1305.c",
+ "src/crypto/cipher/e_des.c",
+ "src/crypto/cipher/e_null.c",
+ "src/crypto/cipher/e_rc2.c",
+ "src/crypto/cipher/e_rc4.c",
+ "src/crypto/cipher/e_ssl3.c",
+ "src/crypto/cipher/e_tls.c",
+ "src/crypto/cipher/tls_cbc.c",
+ "src/crypto/cmac/cmac.c",
+ "src/crypto/conf/conf.c",
+ "src/crypto/cpu-aarch64-linux.c",
+ "src/crypto/cpu-arm-linux.c",
+ "src/crypto/cpu-arm.c",
+ "src/crypto/cpu-intel.c",
+ "src/crypto/crypto.c",
+ "src/crypto/curve25519/curve25519.c",
+ "src/crypto/curve25519/spake25519.c",
+ "src/crypto/curve25519/x25519-x86_64.c",
+ "src/crypto/des/des.c",
+ "src/crypto/dh/check.c",
+ "src/crypto/dh/dh.c",
+ "src/crypto/dh/dh_asn1.c",
+ "src/crypto/dh/params.c",
+ "src/crypto/digest/digest.c",
+ "src/crypto/digest/digests.c",
+ "src/crypto/dsa/dsa.c",
+ "src/crypto/dsa/dsa_asn1.c",
+ "src/crypto/ec/ec.c",
+ "src/crypto/ec/ec_asn1.c",
+ "src/crypto/ec/ec_key.c",
+ "src/crypto/ec/ec_montgomery.c",
+ "src/crypto/ec/oct.c",
+ "src/crypto/ec/p224-64.c",
+ "src/crypto/ec/p256-64.c",
+ "src/crypto/ec/p256-x86_64.c",
+ "src/crypto/ec/simple.c",
+ "src/crypto/ec/util-64.c",
+ "src/crypto/ec/wnaf.c",
+ "src/crypto/ecdh/ecdh.c",
+ "src/crypto/ecdsa/ecdsa.c",
+ "src/crypto/ecdsa/ecdsa_asn1.c",
+ "src/crypto/engine/engine.c",
+ "src/crypto/err/err.c",
+ "src/crypto/evp/digestsign.c",
+ "src/crypto/evp/evp.c",
+ "src/crypto/evp/evp_asn1.c",
+ "src/crypto/evp/evp_ctx.c",
+ "src/crypto/evp/p_dsa_asn1.c",
+ "src/crypto/evp/p_ec.c",
+ "src/crypto/evp/p_ec_asn1.c",
+ "src/crypto/evp/p_rsa.c",
+ "src/crypto/evp/p_rsa_asn1.c",
+ "src/crypto/evp/pbkdf.c",
+ "src/crypto/evp/print.c",
+ "src/crypto/evp/sign.c",
+ "src/crypto/ex_data.c",
+ "src/crypto/hkdf/hkdf.c",
+ "src/crypto/hmac/hmac.c",
+ "src/crypto/lhash/lhash.c",
+ "src/crypto/md4/md4.c",
+ "src/crypto/md5/md5.c",
+ "src/crypto/mem.c",
+ "src/crypto/modes/cbc.c",
+ "src/crypto/modes/cfb.c",
+ "src/crypto/modes/ctr.c",
+ "src/crypto/modes/gcm.c",
+ "src/crypto/modes/ofb.c",
+ "src/crypto/newhope/error_correction.c",
+ "src/crypto/newhope/newhope.c",
+ "src/crypto/newhope/ntt.c",
+ "src/crypto/newhope/poly.c",
+ "src/crypto/newhope/precomp.c",
+ "src/crypto/newhope/reduce.c",
+ "src/crypto/obj/obj.c",
+ "src/crypto/obj/obj_xref.c",
+ "src/crypto/pem/pem_all.c",
+ "src/crypto/pem/pem_info.c",
+ "src/crypto/pem/pem_lib.c",
+ "src/crypto/pem/pem_oth.c",
+ "src/crypto/pem/pem_pk8.c",
+ "src/crypto/pem/pem_pkey.c",
+ "src/crypto/pem/pem_x509.c",
+ "src/crypto/pem/pem_xaux.c",
+ "src/crypto/pkcs8/p5_pbe.c",
+ "src/crypto/pkcs8/p5_pbev2.c",
+ "src/crypto/pkcs8/p8_pkey.c",
+ "src/crypto/pkcs8/pkcs8.c",
+ "src/crypto/poly1305/poly1305.c",
+ "src/crypto/poly1305/poly1305_arm.c",
+ "src/crypto/poly1305/poly1305_vec.c",
+ "src/crypto/rand/deterministic.c",
+ "src/crypto/rand/rand.c",
+ "src/crypto/rand/urandom.c",
+ "src/crypto/rand/windows.c",
+ "src/crypto/rc4/rc4.c",
+ "src/crypto/refcount_c11.c",
+ "src/crypto/refcount_lock.c",
+ "src/crypto/rsa/blinding.c",
+ "src/crypto/rsa/padding.c",
+ "src/crypto/rsa/rsa.c",
+ "src/crypto/rsa/rsa_asn1.c",
+ "src/crypto/rsa/rsa_impl.c",
+ "src/crypto/sha/sha1.c",
+ "src/crypto/sha/sha256.c",
+ "src/crypto/sha/sha512.c",
+ "src/crypto/stack/stack.c",
+ "src/crypto/thread.c",
+ "src/crypto/thread_none.c",
+ "src/crypto/thread_pthread.c",
+ "src/crypto/thread_win.c",
+ "src/crypto/time_support.c",
+ "src/crypto/x509/a_digest.c",
+ "src/crypto/x509/a_sign.c",
+ "src/crypto/x509/a_strex.c",
+ "src/crypto/x509/a_verify.c",
+ "src/crypto/x509/algorithm.c",
+ "src/crypto/x509/asn1_gen.c",
+ "src/crypto/x509/by_dir.c",
+ "src/crypto/x509/by_file.c",
+ "src/crypto/x509/i2d_pr.c",
+ "src/crypto/x509/pkcs7.c",
+ "src/crypto/x509/rsa_pss.c",
+ "src/crypto/x509/t_crl.c",
+ "src/crypto/x509/t_req.c",
+ "src/crypto/x509/t_x509.c",
+ "src/crypto/x509/t_x509a.c",
+ "src/crypto/x509/x509.c",
+ "src/crypto/x509/x509_att.c",
+ "src/crypto/x509/x509_cmp.c",
+ "src/crypto/x509/x509_d2.c",
+ "src/crypto/x509/x509_def.c",
+ "src/crypto/x509/x509_ext.c",
+ "src/crypto/x509/x509_lu.c",
+ "src/crypto/x509/x509_obj.c",
+ "src/crypto/x509/x509_r2x.c",
+ "src/crypto/x509/x509_req.c",
+ "src/crypto/x509/x509_set.c",
+ "src/crypto/x509/x509_trs.c",
+ "src/crypto/x509/x509_txt.c",
+ "src/crypto/x509/x509_v3.c",
+ "src/crypto/x509/x509_vfy.c",
+ "src/crypto/x509/x509_vpm.c",
+ "src/crypto/x509/x509cset.c",
+ "src/crypto/x509/x509name.c",
+ "src/crypto/x509/x509rset.c",
+ "src/crypto/x509/x509spki.c",
+ "src/crypto/x509/x509type.c",
+ "src/crypto/x509/x_algor.c",
+ "src/crypto/x509/x_all.c",
+ "src/crypto/x509/x_attrib.c",
+ "src/crypto/x509/x_crl.c",
+ "src/crypto/x509/x_exten.c",
+ "src/crypto/x509/x_info.c",
+ "src/crypto/x509/x_name.c",
+ "src/crypto/x509/x_pkey.c",
+ "src/crypto/x509/x_pubkey.c",
+ "src/crypto/x509/x_req.c",
+ "src/crypto/x509/x_sig.c",
+ "src/crypto/x509/x_spki.c",
+ "src/crypto/x509/x_val.c",
+ "src/crypto/x509/x_x509.c",
+ "src/crypto/x509/x_x509a.c",
+ "src/crypto/x509v3/pcy_cache.c",
+ "src/crypto/x509v3/pcy_data.c",
+ "src/crypto/x509v3/pcy_lib.c",
+ "src/crypto/x509v3/pcy_map.c",
+ "src/crypto/x509v3/pcy_node.c",
+ "src/crypto/x509v3/pcy_tree.c",
+ "src/crypto/x509v3/v3_akey.c",
+ "src/crypto/x509v3/v3_akeya.c",
+ "src/crypto/x509v3/v3_alt.c",
+ "src/crypto/x509v3/v3_bcons.c",
+ "src/crypto/x509v3/v3_bitst.c",
+ "src/crypto/x509v3/v3_conf.c",
+ "src/crypto/x509v3/v3_cpols.c",
+ "src/crypto/x509v3/v3_crld.c",
+ "src/crypto/x509v3/v3_enum.c",
+ "src/crypto/x509v3/v3_extku.c",
+ "src/crypto/x509v3/v3_genn.c",
+ "src/crypto/x509v3/v3_ia5.c",
+ "src/crypto/x509v3/v3_info.c",
+ "src/crypto/x509v3/v3_int.c",
+ "src/crypto/x509v3/v3_lib.c",
+ "src/crypto/x509v3/v3_ncons.c",
+ "src/crypto/x509v3/v3_pci.c",
+ "src/crypto/x509v3/v3_pcia.c",
+ "src/crypto/x509v3/v3_pcons.c",
+ "src/crypto/x509v3/v3_pku.c",
+ "src/crypto/x509v3/v3_pmaps.c",
+ "src/crypto/x509v3/v3_prn.c",
+ "src/crypto/x509v3/v3_purp.c",
+ "src/crypto/x509v3/v3_skey.c",
+ "src/crypto/x509v3/v3_sxnet.c",
+ "src/crypto/x509v3/v3_utl.c",
+ ],
+ target: {
+ android_arm64: {
+ srcs: [
+ "linux-aarch64/crypto/aes/aesv8-armx64.S",
+ "linux-aarch64/crypto/bn/armv8-mont.S",
+ "linux-aarch64/crypto/chacha/chacha-armv8.S",
+ "linux-aarch64/crypto/modes/ghashv8-armx64.S",
+ "linux-aarch64/crypto/sha/sha1-armv8.S",
+ "linux-aarch64/crypto/sha/sha256-armv8.S",
+ "linux-aarch64/crypto/sha/sha512-armv8.S",
+ ],
+ },
+ android_arm: {
+ srcs: [
+ "linux-arm/crypto/aes/aes-armv4.S",
+ "linux-arm/crypto/aes/aesv8-armx32.S",
+ "linux-arm/crypto/aes/bsaes-armv7.S",
+ "linux-arm/crypto/bn/armv4-mont.S",
+ "linux-arm/crypto/chacha/chacha-armv4.S",
+ "linux-arm/crypto/modes/ghash-armv4.S",
+ "linux-arm/crypto/modes/ghashv8-armx32.S",
+ "linux-arm/crypto/sha/sha1-armv4-large.S",
+ "linux-arm/crypto/sha/sha256-armv4.S",
+ "linux-arm/crypto/sha/sha512-armv4.S",
+ "src/crypto/curve25519/asm/x25519-asm-arm.S",
+ "src/crypto/poly1305/poly1305_arm_asm.S",
+ ],
+ },
+ android_x86: {
+ srcs: [
+ "linux-x86/crypto/aes/aes-586.S",
+ "linux-x86/crypto/aes/aesni-x86.S",
+ "linux-x86/crypto/aes/vpaes-x86.S",
+ "linux-x86/crypto/bn/bn-586.S",
+ "linux-x86/crypto/bn/co-586.S",
+ "linux-x86/crypto/bn/x86-mont.S",
+ "linux-x86/crypto/chacha/chacha-x86.S",
+ "linux-x86/crypto/md5/md5-586.S",
+ "linux-x86/crypto/modes/ghash-x86.S",
+ "linux-x86/crypto/rc4/rc4-586.S",
+ "linux-x86/crypto/sha/sha1-586.S",
+ "linux-x86/crypto/sha/sha256-586.S",
+ "linux-x86/crypto/sha/sha512-586.S",
+ ],
+ },
+ linux_x86: {
+ srcs: [
+ "linux-x86/crypto/aes/aes-586.S",
+ "linux-x86/crypto/aes/aesni-x86.S",
+ "linux-x86/crypto/aes/vpaes-x86.S",
+ "linux-x86/crypto/bn/bn-586.S",
+ "linux-x86/crypto/bn/co-586.S",
+ "linux-x86/crypto/bn/x86-mont.S",
+ "linux-x86/crypto/chacha/chacha-x86.S",
+ "linux-x86/crypto/md5/md5-586.S",
+ "linux-x86/crypto/modes/ghash-x86.S",
+ "linux-x86/crypto/rc4/rc4-586.S",
+ "linux-x86/crypto/sha/sha1-586.S",
+ "linux-x86/crypto/sha/sha256-586.S",
+ "linux-x86/crypto/sha/sha512-586.S",
+ ],
+ },
+ android_x86_64: {
+ srcs: [
+ "linux-x86_64/crypto/aes/aes-x86_64.S",
+ "linux-x86_64/crypto/aes/aesni-x86_64.S",
+ "linux-x86_64/crypto/aes/bsaes-x86_64.S",
+ "linux-x86_64/crypto/aes/vpaes-x86_64.S",
+ "linux-x86_64/crypto/bn/rsaz-avx2.S",
+ "linux-x86_64/crypto/bn/rsaz-x86_64.S",
+ "linux-x86_64/crypto/bn/x86_64-mont.S",
+ "linux-x86_64/crypto/bn/x86_64-mont5.S",
+ "linux-x86_64/crypto/chacha/chacha-x86_64.S",
+ "linux-x86_64/crypto/ec/p256-x86_64-asm.S",
+ "linux-x86_64/crypto/md5/md5-x86_64.S",
+ "linux-x86_64/crypto/modes/aesni-gcm-x86_64.S",
+ "linux-x86_64/crypto/modes/ghash-x86_64.S",
+ "linux-x86_64/crypto/rand/rdrand-x86_64.S",
+ "linux-x86_64/crypto/rc4/rc4-x86_64.S",
+ "linux-x86_64/crypto/sha/sha1-x86_64.S",
+ "linux-x86_64/crypto/sha/sha256-x86_64.S",
+ "linux-x86_64/crypto/sha/sha512-x86_64.S",
+ "src/crypto/curve25519/asm/x25519-asm-x86_64.S",
+ ],
+ },
+ linux_x86_64: {
+ srcs: [
+ "linux-x86_64/crypto/aes/aes-x86_64.S",
+ "linux-x86_64/crypto/aes/aesni-x86_64.S",
+ "linux-x86_64/crypto/aes/bsaes-x86_64.S",
+ "linux-x86_64/crypto/aes/vpaes-x86_64.S",
+ "linux-x86_64/crypto/bn/rsaz-avx2.S",
+ "linux-x86_64/crypto/bn/rsaz-x86_64.S",
+ "linux-x86_64/crypto/bn/x86_64-mont.S",
+ "linux-x86_64/crypto/bn/x86_64-mont5.S",
+ "linux-x86_64/crypto/chacha/chacha-x86_64.S",
+ "linux-x86_64/crypto/ec/p256-x86_64-asm.S",
+ "linux-x86_64/crypto/md5/md5-x86_64.S",
+ "linux-x86_64/crypto/modes/aesni-gcm-x86_64.S",
+ "linux-x86_64/crypto/modes/ghash-x86_64.S",
+ "linux-x86_64/crypto/rand/rdrand-x86_64.S",
+ "linux-x86_64/crypto/rc4/rc4-x86_64.S",
+ "linux-x86_64/crypto/sha/sha1-x86_64.S",
+ "linux-x86_64/crypto/sha/sha256-x86_64.S",
+ "linux-x86_64/crypto/sha/sha512-x86_64.S",
+ "src/crypto/curve25519/asm/x25519-asm-x86_64.S",
+ ],
+ },
+ },
+}
+
+cc_defaults {
+ name: "libssl_sources",
+ srcs: [
+ "src/ssl/custom_extensions.c",
+ "src/ssl/d1_both.c",
+ "src/ssl/d1_lib.c",
+ "src/ssl/d1_meth.c",
+ "src/ssl/d1_pkt.c",
+ "src/ssl/d1_srtp.c",
+ "src/ssl/dtls_record.c",
+ "src/ssl/handshake_client.c",
+ "src/ssl/handshake_server.c",
+ "src/ssl/pqueue/pqueue.c",
+ "src/ssl/s3_both.c",
+ "src/ssl/s3_enc.c",
+ "src/ssl/s3_lib.c",
+ "src/ssl/s3_meth.c",
+ "src/ssl/s3_pkt.c",
+ "src/ssl/ssl_aead_ctx.c",
+ "src/ssl/ssl_asn1.c",
+ "src/ssl/ssl_buffer.c",
+ "src/ssl/ssl_cert.c",
+ "src/ssl/ssl_cipher.c",
+ "src/ssl/ssl_ecdh.c",
+ "src/ssl/ssl_file.c",
+ "src/ssl/ssl_lib.c",
+ "src/ssl/ssl_rsa.c",
+ "src/ssl/ssl_session.c",
+ "src/ssl/ssl_stat.c",
+ "src/ssl/t1_enc.c",
+ "src/ssl/t1_lib.c",
+ "src/ssl/tls_record.c",
+ ],
+}
+
+cc_defaults {
+ name: "bssl_sources",
+ srcs: [
+ "src/tool/args.cc",
+ "src/tool/ciphers.cc",
+ "src/tool/client.cc",
+ "src/tool/const.cc",
+ "src/tool/digest.cc",
+ "src/tool/generate_ed25519.cc",
+ "src/tool/genrsa.cc",
+ "src/tool/pkcs12.cc",
+ "src/tool/rand.cc",
+ "src/tool/server.cc",
+ "src/tool/speed.cc",
+ "src/tool/tool.cc",
+ "src/tool/transport_common.cc",
+ ],
+}
diff --git a/sources.mk b/sources.mk
index 14bf8f1..c3ff5f1 100644
--- a/sources.mk
+++ b/sources.mk
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# This file is created by generate_build_files.py. Do not edit manually.
+
crypto_sources := \
android_compat_hacks.c\
android_compat_keywrap.c\
@@ -290,52 +292,6 @@
src/crypto/x509v3/v3_sxnet.c\
src/crypto/x509v3/v3_utl.c\
-ssl_sources := \
- src/ssl/custom_extensions.c\
- src/ssl/d1_both.c\
- src/ssl/d1_lib.c\
- src/ssl/d1_meth.c\
- src/ssl/d1_pkt.c\
- src/ssl/d1_srtp.c\
- src/ssl/dtls_record.c\
- src/ssl/handshake_client.c\
- src/ssl/handshake_server.c\
- src/ssl/pqueue/pqueue.c\
- src/ssl/s3_both.c\
- src/ssl/s3_enc.c\
- src/ssl/s3_lib.c\
- src/ssl/s3_meth.c\
- src/ssl/s3_pkt.c\
- src/ssl/ssl_aead_ctx.c\
- src/ssl/ssl_asn1.c\
- src/ssl/ssl_buffer.c\
- src/ssl/ssl_cert.c\
- src/ssl/ssl_cipher.c\
- src/ssl/ssl_ecdh.c\
- src/ssl/ssl_file.c\
- src/ssl/ssl_lib.c\
- src/ssl/ssl_rsa.c\
- src/ssl/ssl_session.c\
- src/ssl/ssl_stat.c\
- src/ssl/t1_enc.c\
- src/ssl/t1_lib.c\
- src/ssl/tls_record.c\
-
-tool_sources := \
- src/tool/args.cc\
- src/tool/ciphers.cc\
- src/tool/client.cc\
- src/tool/const.cc\
- src/tool/digest.cc\
- src/tool/generate_ed25519.cc\
- src/tool/genrsa.cc\
- src/tool/pkcs12.cc\
- src/tool/rand.cc\
- src/tool/server.cc\
- src/tool/speed.cc\
- src/tool/tool.cc\
- src/tool/transport_common.cc\
-
linux_aarch64_sources := \
linux-aarch64/crypto/aes/aesv8-armx64.S\
linux-aarch64/crypto/bn/armv8-mont.S\
@@ -395,74 +351,3 @@
linux-x86_64/crypto/sha/sha512-x86_64.S\
src/crypto/curve25519/asm/x25519-asm-x86_64.S\
-mac_x86_sources := \
- mac-x86/crypto/aes/aes-586.S\
- mac-x86/crypto/aes/aesni-x86.S\
- mac-x86/crypto/aes/vpaes-x86.S\
- mac-x86/crypto/bn/bn-586.S\
- mac-x86/crypto/bn/co-586.S\
- mac-x86/crypto/bn/x86-mont.S\
- mac-x86/crypto/chacha/chacha-x86.S\
- mac-x86/crypto/md5/md5-586.S\
- mac-x86/crypto/modes/ghash-x86.S\
- mac-x86/crypto/rc4/rc4-586.S\
- mac-x86/crypto/sha/sha1-586.S\
- mac-x86/crypto/sha/sha256-586.S\
- mac-x86/crypto/sha/sha512-586.S\
-
-mac_x86_64_sources := \
- mac-x86_64/crypto/aes/aes-x86_64.S\
- mac-x86_64/crypto/aes/aesni-x86_64.S\
- mac-x86_64/crypto/aes/bsaes-x86_64.S\
- mac-x86_64/crypto/aes/vpaes-x86_64.S\
- mac-x86_64/crypto/bn/rsaz-avx2.S\
- mac-x86_64/crypto/bn/rsaz-x86_64.S\
- mac-x86_64/crypto/bn/x86_64-mont.S\
- mac-x86_64/crypto/bn/x86_64-mont5.S\
- mac-x86_64/crypto/chacha/chacha-x86_64.S\
- mac-x86_64/crypto/ec/p256-x86_64-asm.S\
- mac-x86_64/crypto/md5/md5-x86_64.S\
- mac-x86_64/crypto/modes/aesni-gcm-x86_64.S\
- mac-x86_64/crypto/modes/ghash-x86_64.S\
- mac-x86_64/crypto/rand/rdrand-x86_64.S\
- mac-x86_64/crypto/rc4/rc4-x86_64.S\
- mac-x86_64/crypto/sha/sha1-x86_64.S\
- mac-x86_64/crypto/sha/sha256-x86_64.S\
- mac-x86_64/crypto/sha/sha512-x86_64.S\
- src/crypto/curve25519/asm/x25519-asm-x86_64.S\
-
-win_x86_sources := \
- win-x86/crypto/aes/aes-586.asm\
- win-x86/crypto/aes/aesni-x86.asm\
- win-x86/crypto/aes/vpaes-x86.asm\
- win-x86/crypto/bn/bn-586.asm\
- win-x86/crypto/bn/co-586.asm\
- win-x86/crypto/bn/x86-mont.asm\
- win-x86/crypto/chacha/chacha-x86.asm\
- win-x86/crypto/md5/md5-586.asm\
- win-x86/crypto/modes/ghash-x86.asm\
- win-x86/crypto/rc4/rc4-586.asm\
- win-x86/crypto/sha/sha1-586.asm\
- win-x86/crypto/sha/sha256-586.asm\
- win-x86/crypto/sha/sha512-586.asm\
-
-win_x86_64_sources := \
- win-x86_64/crypto/aes/aes-x86_64.asm\
- win-x86_64/crypto/aes/aesni-x86_64.asm\
- win-x86_64/crypto/aes/bsaes-x86_64.asm\
- win-x86_64/crypto/aes/vpaes-x86_64.asm\
- win-x86_64/crypto/bn/rsaz-avx2.asm\
- win-x86_64/crypto/bn/rsaz-x86_64.asm\
- win-x86_64/crypto/bn/x86_64-mont.asm\
- win-x86_64/crypto/bn/x86_64-mont5.asm\
- win-x86_64/crypto/chacha/chacha-x86_64.asm\
- win-x86_64/crypto/ec/p256-x86_64-asm.asm\
- win-x86_64/crypto/md5/md5-x86_64.asm\
- win-x86_64/crypto/modes/aesni-gcm-x86_64.asm\
- win-x86_64/crypto/modes/ghash-x86_64.asm\
- win-x86_64/crypto/rand/rdrand-x86_64.asm\
- win-x86_64/crypto/rc4/rc4-x86_64.asm\
- win-x86_64/crypto/sha/sha1-x86_64.asm\
- win-x86_64/crypto/sha/sha256-x86_64.asm\
- win-x86_64/crypto/sha/sha512-x86_64.asm\
-
diff --git a/src/util/generate_build_files.py b/src/util/generate_build_files.py
index 76c390b..f545d7d 100644
--- a/src/util/generate_build_files.py
+++ b/src/util/generate_build_files.py
@@ -74,6 +74,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# This file is created by generate_build_files.py. Do not edit manually.
+
"""
def ExtraFiles(self):
@@ -86,15 +88,68 @@
out.write('\n')
def WriteFiles(self, files, asm_outputs):
+ # New Android.bp format
+ with open('sources.bp', 'w+') as blueprint:
+ blueprint.write(self.header.replace('#', '//'))
+
+ blueprint.write('cc_defaults {\n')
+ blueprint.write(' name: "libcrypto_sources",\n')
+ blueprint.write(' srcs: [\n')
+ for f in sorted(files['crypto'] + self.ExtraFiles()):
+ blueprint.write(' "%s",\n' % f)
+ blueprint.write(' ],\n')
+ blueprint.write(' target: {\n')
+
+ for ((osname, arch), asm_files) in asm_outputs:
+ if osname != 'linux':
+ continue
+ if arch == 'aarch64':
+ arch = 'arm64'
+
+ blueprint.write(' android_%s: {\n' % arch)
+ blueprint.write(' srcs: [\n')
+ for f in sorted(asm_files):
+ blueprint.write(' "%s",\n' % f)
+ blueprint.write(' ],\n')
+ blueprint.write(' },\n')
+
+ if arch == 'x86' or arch == 'x86_64':
+ blueprint.write(' linux_%s: {\n' % arch)
+ blueprint.write(' srcs: [\n')
+ for f in sorted(asm_files):
+ blueprint.write(' "%s",\n' % f)
+ blueprint.write(' ],\n')
+ blueprint.write(' },\n')
+
+ blueprint.write(' },\n')
+ blueprint.write('}\n\n')
+
+ blueprint.write('cc_defaults {\n')
+ blueprint.write(' name: "libssl_sources",\n')
+ blueprint.write(' srcs: [\n')
+ for f in sorted(files['ssl']):
+ blueprint.write(' "%s",\n' % f)
+ blueprint.write(' ],\n')
+ blueprint.write('}\n\n')
+
+ blueprint.write('cc_defaults {\n')
+ blueprint.write(' name: "bssl_sources",\n')
+ blueprint.write(' srcs: [\n')
+ for f in sorted(files['tool']):
+ blueprint.write(' "%s",\n' % f)
+ blueprint.write(' ],\n')
+ blueprint.write('}\n')
+
+ # Legacy Android.mk format, only used by Trusty in new branches
with open('sources.mk', 'w+') as makefile:
makefile.write(self.header)
crypto_files = files['crypto'] + self.ExtraFiles()
self.PrintVariableSection(makefile, 'crypto_sources', crypto_files)
- self.PrintVariableSection(makefile, 'ssl_sources', files['ssl'])
- self.PrintVariableSection(makefile, 'tool_sources', files['tool'])
for ((osname, arch), asm_files) in asm_outputs:
+ if osname != 'linux':
+ continue
self.PrintVariableSection(
makefile, '%s_%s_sources' % (osname, arch), asm_files)
diff --git a/ssl-sources.mk b/ssl-sources.mk
deleted file mode 100644
index a4c8470..0000000
--- a/ssl-sources.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk
-include $(LOCAL_PATH)/sources.mk
-
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM
-LOCAL_SRC_FILES += $(ssl_sources)