diff --git a/Makefile b/Makefile index eb6e6dcdb..b4e1013fc 100644 --- a/Makefile +++ b/Makefile @@ -1939,7 +1939,7 @@ sync-web-icons: $(KRYON_SYNC_ICONS) sh $(KRYON_SYNC_ICONS) web-assets/icons $(WEB_SHARED_ICON_SHEETS) cp assets/app/icon.png web-assets/icons/$(APP_NAME).png -$(CLICK_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt +$(CLICK_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt mk/sync.mk Makefile rm -rf $(CLICK_LIBOQS_BUILD_DIR) $(CMAKE) -S $(LIBOQS_DIR) -B $(CLICK_LIBOQS_BUILD_DIR) \ -DCMAKE_SYSTEM_NAME=Linux \ @@ -1954,7 +1954,7 @@ $(CLICK_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt -DOQS_DIST_BUILD=OFF \ -DOQS_OPT_TARGET=generic \ $(KRYON_LIBOQS_CPU_FEATURE_CMAKE_FLAGS) \ - -DOQS_MINIMAL_BUILD=$(KRYON_LIBOQS_MINIMAL_BUILD) + -DOQS_MINIMAL_BUILD="$(KRYON_LIBOQS_MINIMAL_BUILD)" $(CMAKE) --build $(CLICK_LIBOQS_BUILD_DIR) --target oqs $(SQLITE_AMALGAMATION_C) $(SQLITE_AMALGAMATION_H): $(SQLITE_DIR)/configure $(SQLITE_DIR)/manifest | $(BUILD_OBJ_DIR) @@ -1993,7 +1993,7 @@ $(WIN64_CURL_A): $(CURL_DIR)/CMakeLists.txt -DBUILD_TESTING=OFF $(CMAKE) --build $(WIN64_CURL_BUILD_DIR) --target install -$(WIN64_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt +$(WIN64_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt mk/sync.mk Makefile rm -rf $(WIN64_LIBOQS_BUILD_DIR) $(CMAKE) -S $(LIBOQS_DIR) -B $(WIN64_LIBOQS_BUILD_DIR) \ -DCMAKE_SYSTEM_NAME=Windows \ @@ -2009,7 +2009,7 @@ $(WIN64_LIBOQS_A): $(LIBOQS_DIR)/CMakeLists.txt -DOQS_DIST_BUILD=OFF \ -DOQS_OPT_TARGET=generic \ $(KRYON_LIBOQS_CPU_FEATURE_CMAKE_FLAGS) \ - -DOQS_MINIMAL_BUILD=$(KRYON_LIBOQS_MINIMAL_BUILD) + -DOQS_MINIMAL_BUILD="$(KRYON_LIBOQS_MINIMAL_BUILD)" $(CMAKE) --build $(WIN64_LIBOQS_BUILD_DIR) --target oqs $(TARGET): $(ZIRAN_BUILD_DIR)/libziran.a Makefile $(SRC) $(KRYON_LIBRARY_BUILD_DIR)/libkryon.a $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_FILES) $(EMBEDDED_ASSETS_C) $(KRYON_NATIVE_BACKEND_DEPS) $(LIBOQS_A) $(CURL_PROTOCOL_CHECK) | $(NATIVE_BIN_DIR) diff --git a/droid/app/src/main/cpp/CMakeLists.txt b/droid/app/src/main/cpp/CMakeLists.txt index 039614f90..d7b2e0429 100644 --- a/droid/app/src/main/cpp/CMakeLists.txt +++ b/droid/app/src/main/cpp/CMakeLists.txt @@ -27,7 +27,7 @@ set(SQLITE_AMALGAMATION_H "${SQLITE_BUILD_DIR}/sqlite3.h") include("${KRYON_DIR}/cmake/KryonAndroid.cmake") set(OQS_BUILD_ONLY_LIB ON CACHE BOOL "" FORCE) set(OQS_USE_OPENSSL OFF CACHE BOOL "" FORCE) -set(OQS_MINIMAL_BUILD "SIG_ml_dsa_44" CACHE STRING "" FORCE) +set(OQS_MINIMAL_BUILD "SIG_ml_dsa_44;KEM_ml_kem_768" CACHE STRING "" FORCE) set(OQS_DIST_BUILD OFF CACHE BOOL "" FORCE) set(OQS_OPT_TARGET generic CACHE STRING "" FORCE) foreach(oqs_x86_feature diff --git a/mk/sync.mk b/mk/sync.mk index 337da4b54..ad2f49ed9 100644 --- a/mk/sync.mk +++ b/mk/sync.mk @@ -7,7 +7,7 @@ KRYON_LIBOQS_A := $(KRYON_LIBOQS_BUILD_DIR)/lib/liboqs.a KRYON_LIBOQS_INCLUDE := -I$(KRYON_LIBOQS_BUILD_DIR)/include KRYON_WEB_LIBOQS_A := $(KRYON_WEB_LIBOQS_BUILD_DIR)/lib/liboqs.a KRYON_LIBOQS_BUILD_TYPE ?= MinSizeRel -KRYON_LIBOQS_MINIMAL_BUILD ?= SIG_ml_dsa_44 +KRYON_LIBOQS_MINIMAL_BUILD ?= SIG_ml_dsa_44;KEM_ml_kem_768 KRYON_CURL_DIR := build/packages/curl KRYON_CURL_BUILD_DIR := $(KRYON_VENDOR_BUILD_DIR)/inbe-curl @@ -25,24 +25,24 @@ KRYON_CURL_BUILD_TYPE ?= MinSizeRel KRYON_CURL_CFLAGS := -DCURL_STATICLIB -I$(KRYON_CURL_INCLUDE_DIR) KRYON_CURL_LDLIBS := $(KRYON_CURL_A) -lssl -lcrypto -lz -lpthread -$(KRYON_LIBOQS_A): $(KRYON_LIBOQS_DIR)/CMakeLists.txt +$(KRYON_LIBOQS_A): $(KRYON_LIBOQS_DIR)/CMakeLists.txt mk/sync.mk $(CMAKE) -S $(KRYON_LIBOQS_DIR) -B $(KRYON_LIBOQS_BUILD_DIR) \ -DCMAKE_BUILD_TYPE=$(KRYON_LIBOQS_BUILD_TYPE) \ -DBUILD_SHARED_LIBS=OFF -DOQS_BUILD_ONLY_LIB=ON \ -DOQS_USE_OPENSSL=OFF -DOQS_DIST_BUILD=OFF \ -DOQS_OPT_TARGET=generic \ $(KRYON_LIBOQS_CPU_FEATURE_CMAKE_FLAGS) \ - -DOQS_MINIMAL_BUILD=$(KRYON_LIBOQS_MINIMAL_BUILD) + -DOQS_MINIMAL_BUILD="$(KRYON_LIBOQS_MINIMAL_BUILD)" $(CMAKE) --build $(KRYON_LIBOQS_BUILD_DIR) --target oqs -$(KRYON_WEB_LIBOQS_A): $(KRYON_LIBOQS_DIR)/CMakeLists.txt +$(KRYON_WEB_LIBOQS_A): $(KRYON_LIBOQS_DIR)/CMakeLists.txt mk/sync.mk $(WEB_EMCMAKE) $(CMAKE) -S $(KRYON_LIBOQS_DIR) -B $(KRYON_WEB_LIBOQS_BUILD_DIR) \ -DCMAKE_BUILD_TYPE=$(KRYON_LIBOQS_BUILD_TYPE) \ -DBUILD_SHARED_LIBS=OFF -DOQS_BUILD_ONLY_LIB=ON \ -DOQS_USE_OPENSSL=OFF -DOQS_DIST_BUILD=OFF \ -DOQS_OPT_TARGET=generic \ $(KRYON_LIBOQS_CPU_FEATURE_CMAKE_FLAGS) \ - -DOQS_MINIMAL_BUILD=$(KRYON_LIBOQS_MINIMAL_BUILD) + -DOQS_MINIMAL_BUILD="$(KRYON_LIBOQS_MINIMAL_BUILD)" $(CMAKE) --build $(KRYON_WEB_LIBOQS_BUILD_DIR) --target oqs $(KRYON_CURL_A): $(KRYON_CURL_DIR)/CMakeLists.txt