diff --git a/common.mk b/common.mk
index ebd6aa0..3db4468 100644
--- a/common.mk
+++ b/common.mk
@@ -15,8 +15,9 @@
 
 ifeq ($(LOCAL_USE_AAPT2),true)
 LOCAL_STATIC_ANDROID_LIBRARIES += \
-    android-support-annotations \
-    android-support-v4 \
+    androidx.annotation_annotation \
+    androidx.core_core \
+    androidx.preference_preference \
     OmniLib
 else
 LOCAL_RESOURCE_DIR += $(call my-dir)/res
@@ -25,23 +26,23 @@
 ## Include transitive dependencies below
 
 # Include android-support-v7-preference, if not already included
-ifeq (,$(findstring android-support-v7-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference
+ifeq (,$(findstring androidx-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
+LOCAL_RESOURCE_DIR += frameworks/support/x/preference/res
+LOCAL_AAPT_FLAGS += --extra-packages androidx.preference
+LOCAL_STATIC_JAVA_LIBRARIES += androidx-preference
 endif
 
 # Include android-support-v14-preference, if not already included
-ifeq (,$(findstring android-support-v14-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference
+ifeq (,$(findstring androidx-preference,$(LOCAL_STATIC_JAVA_LIBRARIES)))
+LOCAL_RESOURCE_DIR += frameworks/support/x/preference/res
+LOCAL_AAPT_FLAGS += --extra-packages androidx.preference
+LOCAL_STATIC_JAVA_LIBRARIES += androidx-preference
 endif
 
 LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.omnilib
 
 LOCAL_STATIC_JAVA_LIBRARIES += \
-    android-support-annotations \
-    android-support-v4 \
+    androidx.annotation_annotation \
+    androidx.core_core \
     OmniLib
 endif