diff --git a/default.xml b/default.xml
index 70aaf2e..47f2a2d 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-9.0.0_r21"
+  <default revision="refs/tags/android-9.0.0_r30"
            remote="aosp"
            sync-c="true"
            sync-j="12" />
@@ -283,7 +283,6 @@
   <project path="external/oj-libjdwp" name="platform/external/oj-libjdwp" groups="pdk" />
   <project path="external/okhttp" name="platform/external/okhttp" groups="pdk" />
   <project path="external/one-true-awk" name="platform/external/one-true-awk" groups="pdk" />
-  <project path="external/opencv" name="platform/external/opencv" groups="pdk-cw-fs,pdk-fs" />
   <project path="external/owasp/sanitizer" name="platform/external/owasp/sanitizer" groups="pdk" />
   <project path="external/parameter-framework" name="platform/external/parameter-framework" groups="pdk" />
   <project path="external/pcre" name="platform/external/pcre" groups="pdk" />
diff --git a/omni-aosp.xml b/omni-aosp.xml
index 7e4bad4..3c2961e 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -39,6 +39,7 @@
   <project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-9.0" />
   <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-9.0" />
   <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-9.0" />
+    <project path="external/skia" name="android_external_skia" remote="omnirom" revision="android-9.0"/>
   <project path="external/toybox" name="android_external_toybox" remote="omnirom" revision="android-9.0" />
 
   <project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-9.0" />
diff --git a/remove-minimal.xml b/remove-minimal.xml
index 226c97b..62af709 100644
--- a/remove-minimal.xml
+++ b/remove-minimal.xml
@@ -143,7 +143,6 @@
     <remove-project name="platform/external/oauth" />
     <remove-project name="platform/external/objenesis" />
     <remove-project name="platform/external/okhttp" />
-    <remove-project name="platform/external/opencv" />
     <remove-project name="platform/external/owasp/sanitizer" />
     <remove-project name="platform/external/parameter-framework" />
     <remove-project name="platform/external/pdfium" />
@@ -160,7 +159,7 @@
     <remove-project name="platform/external/seccomp-tests" />
     <remove-project name="platform/external/sfntly" />
     <remove-project name="platform/external/shflags" />
-    <remove-project name="platform/external/skia" />
+    <remove-project name="android_external_skia"/>
     <remove-project name="platform/external/sl4a" />
     <remove-project name="platform/external/slf4j" />
     <remove-project name="platform/external/smali" />
diff --git a/remove.xml b/remove.xml
index 508ea2d..8b9893b 100644
--- a/remove.xml
+++ b/remove.xml
@@ -65,6 +65,7 @@
   <remove-project name="platform/external/mksh" />
   <remove-project name="platform/external/tinycompress" />
   <remove-project name="platform/external/selinux" />
+    <remove-project name="platform/external/skia"/>
   <remove-project name="platform/external/toybox" />
 
   <remove-project name="platform/frameworks/av" />