Merge 5c9dede575 into bb9187b94c

Android 16 QPR2 is now the active branch of AOSP
Use $(AR)
2026-02-14 12:49:34 +01:00 · 2026-01-03 21:58:45 +01:00 · 2026-01-03 14:47:39 -05:00 · 2025-11-15 22:12:13 +00:00 · 2025-11-15 22:12:13 +00:00 · 2025-11-15 22:12:13 +00:00
2 changed files with 5 additions and 2 deletions
--- a/5
+++ b/5
@ -110,6 +110,9 @@ CPPFLAGS += \
    -DCONFIG_STATS=$(CONFIG_STATS) \
    -DCONFIG_SELF_INIT=$(CONFIG_SELF_INIT)

+$(OUT)/libhardened_malloc$(SUFFIX).a: $(OBJECTS) | $(OUT)
+	$(AR) rcs $@ $^
+
 $(OUT)/libhardened_malloc$(SUFFIX).so: $(OBJECTS) | $(OUT)
 	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ $(LDLIBS) -o $@

@ -138,7 +141,7 @@ tidy:
 	clang-tidy --extra-arg=-std=c++17 $(filter %.cc,$(SOURCES)) -- $(CPPFLAGS)

 clean:
-	rm -f $(OUT)/libhardened_malloc.so $(OBJECTS)
+	rm -f $(OUT)/libhardened_malloc.so $(OUT)/libhardened_malloc.a $(OBJECTS)
 	$(MAKE) -C test/ clean

 test: $(OUT)/libhardened_malloc$(SUFFIX).so
--- a/README.md
+++ b/README.md
@ -83,7 +83,7 @@ there will be custom integration offering better performance in the future
 along with other hardening for the C standard library implementation.

 For Android, only the current generation, actively developed maintenance branch of the Android
-Open Source Project will be supported, which currently means `android16-qpr1-release`.
+Open Source Project will be supported, which currently means `android16-qpr2-release`.

 ## Testing
Author	SHA1	Message	Date
qikp0	4ce3e7cf49	Merge `5c9dede575` into `bb9187b94c`	2026-01-03 21:58:45 +01:00
qikp0	bb9187b94c	Android 16 QPR2 is now the active branch of AOSP	2026-01-03 14:47:39 -05:00
Charles	5c9dede575	Use $(AR)	2025-11-15 22:12:13 +00:00
Charles	1f40535cec	Also remove static library when cleaning	2025-11-15 22:12:13 +00:00
Charles	a22f5f911b	Add an option to build a static library	2025-11-15 22:12:13 +00:00