Browse Source

Merge remote-tracking branch 'omnirom/android-8.1' into twrp-8.1

Change-Id: I83d82856a8baa8fb6e8d9a2c5e8397cccf02a8dd
Captain Throwback 8 years ago
parent
commit
3bd560457f
5 changed files with 10 additions and 3 deletions
  1. 1 2
      default.xml
  2. 2 0
      omni-aosp.xml
  3. 2 0
      omni-default.xml
  4. 3 1
      remove-minimal.xml
  5. 2 0
      remove.xml

+ 1 - 2
default.xml

@@ -3,7 +3,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-8.1.0_r15"
+  <default revision="refs/tags/android-8.1.0_r32"
            remote="aosp"
            sync-c="true"
            sync-j="12" />
@@ -231,7 +231,6 @@
   <project path="external/libusb" name="platform/external/libusb" groups="pdk" />
   <project path="external/libusb-compat" name="platform/external/libusb-compat" groups="pdk" />
   <project path="external/libvncserver" name="platform/external/libvncserver" groups="pdk" />
-  <project path="external/libvorbis" name="platform/external/libvorbis" groups="pdk" />
   <project path="external/libvpx" name="platform/external/libvpx" groups="pdk" />
   <project path="external/libvterm" name="platform/external/libvterm" groups="pdk" />
   <project path="external/libxml2" name="platform/external/libxml2" groups="pdk,libxml2" />

+ 2 - 0
omni-aosp.xml

@@ -29,6 +29,7 @@
   <project path="external/aac" name="android_external_aac" remote="omnirom" revision="android-8.1" />
   <project path="external/chromium-webview" name="android_external_chromium-webview" remote="omnirom" revision="android-8.1" />
   <project path="external/e2fsprogs" name="android_external_e2fsprogs" remote="omnirom" revision="android-8.1" />
+  <project path="external/f2fs-tools" name="android_external_f2fs-tools" remote="omnirom" revision="android-8.1" />  
   <project path="external/mksh" name="android_external_mksh" remote="omnirom" revision="android-8.1" />
   <project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-8.1" />
   <project path="external/selinux" name="android_external_selinux" remote="omnirom" revision="android-8.1" />
@@ -64,6 +65,7 @@
   <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/PhoneCommon" name="android_packages_apps_PhoneCommon" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-8.1" />
+  <project path="packages/apps/Stk" name="android_packages_apps_Stk" remote="omnirom" revision="android-8.1" />
 
   <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-8.1" />
 

+ 2 - 0
omni-default.xml

@@ -25,6 +25,8 @@
   <project path="packages/apps/OmniChange" name="android_packages_apps_OmniChange" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/OmniClock" name="android_packages_apps_OmniClock" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-8.1" />
+  <project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-8.1" />
+  <project path="packages/apps/OmniBrain" name="android_packages_apps_OmniBrain" remote="omnirom" revision="android-8.1" />
   <project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom" revision="android-8.1" />
   <project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom" revision="android-8.1" />

+ 3 - 1
remove-minimal.xml

@@ -124,7 +124,6 @@
     <remove-project name="platform/external/libusb" />
     <remove-project name="platform/external/libusb-compat" />
     <remove-project name="platform/external/libvncserver" />
-    <remove-project name="platform/external/libvorbis" />
     <remove-project name="platform/external/libvpx" />
     <remove-project name="platform/external/libvterm" />
     <remove-project name="platform/external/libxml2" />
@@ -427,8 +426,11 @@
     <remove-project name="android_packages_apps_Messaging" />
     <remove-project name="android_packages_apps_MusicFX" />
     <remove-project name="android_packages_apps_Nfc" />
+    <remove-project name="android_packages_apps_OmniBrain" />
+    <remove-project name="android_packages_apps_OmniLib" />
     <remove-project name="android_packages_apps_PhoneCommon"  />
     <remove-project name="android_packages_apps_Settings" />
+    <remove-project name="android_packages_apps_Stk" />
     <remove-project name="android_packages_inputmethods_LatinIME" />
     <remove-project name="android_packages_providers_DownloadProvider" />
     <remove-project name="android_packages_services_Telecomm"  />

+ 2 - 0
remove.xml

@@ -63,6 +63,7 @@
   <remove-project name="platform/external/aac" />
   <remove-project name="platform/external/e2fsprogs" />
   <remove-project name="platform/external/chromium-webview" />
+  <remove-project name="platform/external/f2fs-tools" />
   <remove-project name="platform/external/libnfnetlink" />
   <remove-project name="platform/external/libnetfilter_conntrack" />
   <remove-project name="platform/external/mksh" />
@@ -137,6 +138,7 @@
   <remove-project name="platform/packages/apps/Nfc" />
   <remove-project name="platform/packages/apps/PhoneCommon" />
   <remove-project name="platform/packages/apps/Settings" />
+  <remove-project name="platform/packages/apps/Stk" />
 
   <remove-project name="platform/packages/inputmethods/LatinIME" />