Parcourir la source

Update

master
Kris Kwiatkowski il y a 5 ans
Parent
révision
9220827628
4 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. +3
    -3
      bssl/Makefile.aarch64
  2. +3
    -1
      bssl/Makefile.native
  3. +1
    -1
      common.mk
  4. +1
    -1
      testapp/Makefile.native

+ 3
- 3
bssl/Makefile.aarch64 Voir le fichier

@@ -19,9 +19,9 @@ prepare: clean
-DCMAKE_BUILD_TYPE=Release \
-DANDROID_ABI=arm64-v8a \
-DOPENSSL_SMALL=1 \
-DCMAKE_C_FLAGS_RELEASE="-Os -fdata-sections" \
-DCMAKE_CXX_FLAGS_RELEASE="-Os -fdata-sections" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections" \
-DCMAKE_C_FLAGS_RELEASE="-Os -fdata-sections -Wno-error=unused-command-line-argument" \
-DCMAKE_CXX_FLAGS_RELEASE="-Os -fdata-sections -Wno-error=unused-command-line-argument" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections -Wno-error=unused-command-line-argument" \
..
build:
cd $(BUILD_DIR); \


+ 3
- 1
bssl/Makefile.native Voir le fichier

@@ -10,11 +10,13 @@ prepare:
mkdir -p $(BUILD_DIR)
cd $(BUILD_DIR); \
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_BUILD_TYPE=Release \
-DOPENSSL_SMALL=1 \
-DCMAKE_C_FLAGS_RELEASE="-Os -fdata-sections" \
-DCMAKE_CXX_FLAGS_RELEASE="-Os -fdata-sections" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--gc-sections" \
..

build:
cd $(BUILD_DIR); \
$(MAKE)
python ~/print_bssl_size.py " -fdata-sections (+)"

+ 1
- 1
common.mk Voir le fichier

@@ -1,5 +1,5 @@
# Constants and makefile shit used in build
mkfile_path = $(abspath $(lastword $(MAKEFILE_LIST)))
current_dir = $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
ANDROID_NDK = /home/hdc/android-ndk-r16b
ANDROID_NDK = /opt/android-ndk
NDK_TARGETVER = 27

+ 1
- 1
testapp/Makefile.native Voir le fichier

@@ -17,7 +17,7 @@ CC=clang

CFLAGS_COMMON=-std=c99 $(DEBUG)
BORINGSSL_CFLAGS=$(CFLAGS_COMMON) -I$(BORINGSSL_DIR)/ -I$(BORINGSSL_DIR)/include
BORINGSSL_LDFLAGS=-L$(BORINGSSL_LIB)/crypto -L$(BORINGSSL_LIB)/ssl -lssl -lcrypto -lpthread
BORINGSSL_LDFLAGS=-L$(BORINGSSL_LIB)/crypto -L$(BORINGSSL_LIB)/ssl -lssl -lcrypto -lpthread -Wl,--gc-sections
MBEDTLS_CFLAGS=$(CFLAGS_COMMON) -I$(MBEDTLS_DIR)/include
MBEDTLS_LDFLAGS=-L$(MBEDTLS_DIR)/library -lmbedx509 -lmbedtls -lmbedcrypto
SRCDIR=src


Chargement…
Annuler
Enregistrer