Separate libc.a hacks into its own component

native/jni/Android.mk

@@ -8,7 +8,12 @@ ifdef B_MAGISK
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magisk
-LOCAL_STATIC_LIBRARIES := libnanopb libsystemproperties libutils-shared libphmap libxhook
+LOCAL_STATIC_LIBRARIES := \
+    libutils \
+    libnanopb \
+    libsystemproperties \
+    libphmap \
+    libxhook
 
 LOCAL_SRC_FILES := \
     core/applets.cpp \
@@ -47,7 +52,10 @@ ifdef B_INIT
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskinit
-LOCAL_STATIC_LIBRARIES := libsepol libxz libutils
+LOCAL_STATIC_LIBRARIES := \
+    libutilx \
+    libsepol \
+    libxz
 
 LOCAL_SRC_FILES := \
     init/init.cpp \
@@ -72,7 +80,15 @@ ifdef B_BOOT
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskboot
-LOCAL_STATIC_LIBRARIES := libmincrypt liblzma liblz4 libbz2 libfdt libutils libz libzopfli
+LOCAL_STATIC_LIBRARIES := \
+    libutilx \
+    libmincrypt \
+    liblzma \
+    liblz4 \
+    libbz2 \
+    libfdt \
+    libz \
+    libzopfli
 
 LOCAL_SRC_FILES := \
     magiskboot/main.cpp \
@@ -94,7 +110,9 @@ ifdef B_POLICY
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := magiskpolicy
-LOCAL_STATIC_LIBRARIES := libsepol libutils
+LOCAL_STATIC_LIBRARIES := \
+    libutilx \
+    libsepol
 
 LOCAL_SRC_FILES := \
     core/applet_stub.cpp \
@@ -114,7 +132,10 @@ ifdef B_PROP
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := resetprop
-LOCAL_STATIC_LIBRARIES := libnanopb libsystemproperties libutils
+LOCAL_STATIC_LIBRARIES := \
+    libutilx \
+    libnanopb \
+    libsystemproperties
 
 LOCAL_SRC_FILES := \
     core/applet_stub.cpp \
@@ -132,7 +153,10 @@ ifneq (,$(wildcard jni/test.cpp))
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := test
-LOCAL_STATIC_LIBRARIES := libutils-shared libphmap
+LOCAL_STATIC_LIBRARIES := \
+    libutils \
+    libphmap
+
 LOCAL_SRC_FILES := test.cpp
 include $(BUILD_EXECUTABLE)