manifest: switch to TeamWin vendor_omni repo

- Changes for TWRP will be pushed here rather than OmniROM
- Add in brotli and bsdiff repos so update-binary can be built
- Add TeamWin remote for better handling
- Cleanup

Change-Id: I63ef2686930b90205be3b36c71039cccba4bbc7d
This commit is contained in:
Captain Throwback 2019-05-07 12:18:43 -04:00
parent f76f168267
commit 36c8d20e76
3 changed files with 9 additions and 40 deletions

View file

@ -13,8 +13,6 @@
<!-- OmniROM Projects -->
<project path="android" name="android" remote="omnirom" revision="android-8.1" />
<project path="vendor/omni" name="android_vendor_omni" remote="omnirom" revision="android-8.1" />
<project path="external/exfat" name="android_external_exfat" remote="omnirom" revision="android-8.1" />
<project path="external/fuse" name="android_external_fuse" remote="omnirom" revision="android-8.0" />
<project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="omnirom" revision="android-8.1"/>

View file

@ -22,8 +22,6 @@
<remove-project name="platform/external/autotest" />
<remove-project name="platform/external/bart" />
<remove-project name="platform/external/blktrace" />
<remove-project name="platform/external/brotli" />
<remove-project name="platform/external/bsdiff" />
<remove-project name="platform/external/caliper" />
<remove-project name="platform/external/c-ares" />
<remove-project name="platform/external/cblas" />

View file

@ -1,40 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote name="TeamWin"
fetch="https://github.com/TeamWin"
review="https://gerrit.twrp.me" />
<!-- Use TeamWin vendor/omni repo as Omni doesn't accept any updates for recovery purposes
TODO: Create vendor/twrp repo to replace this repo -->
<project path="vendor/omni" name="android_vendor_omni" remote="TeamWin" revision="android-8.1" />
<!-- TWRP lives in omnirom, not AOSP -->
<remove-project name="platform/bootable/recovery" />
<project path="bootable/recovery" name="android_bootable_recovery" remote="omnirom" revision="android-9.0" />
<!-- The following changes are no longer needed in 8.1 (only kept for reference) -->
<!-- =========================================================================== -->
<!-- FBE libs (using AOSP tag android-8.0.0_r34) -->
<!-- libkeymaster1.so -> libkeymaster_portable.so and libkeymaster_staging.so -->
<!--
<remove-project name="platform/system/keymaster" />
<remove-project name="platform/system/security" />
<project path="system/keymaster" name="platform/system/keymaster" remote="aosp" revision="refs/tags/android-8.0.0_r34" />
<project path="system/security" name="platform/system/security" remote="aosp" revision="refs/tags/android-8.0.0_r34" />
-->
<!-- weaver -->
<!-- TeamWin/.repo/AOSP is just a staging directory -->
<!--
<project path="TeamWin/.repo/AOSP/hardware/interfaces" name="platform/hardware/interfaces" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
<linkfile src="weaver" dest="hardware/interfaces/weaver" />
</project>
-->
<!-- libkeyutils.so -->
<!-- TeamWin/.repo/AOSP is just a staging directory -->
<!--
<project path="TeamWin/.repo/AOSP/system/core" name="platform/system/core" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
<linkfile src="libkeyutils" dest="system/core/libkeyutils" />
</project>
-->
<!-- =========================================================================== -->
<!-- The following directories are actually needed from android_frameworks_base (for FBE decryption)
* frameworks/base/core/java/android/content (~4MB)
* frameworks/base/core/java/android/security (<1MB)
@ -46,15 +23,11 @@
<project path="TeamWin/.repo/frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-8.1" clone-depth="1" >
<linkfile src="core/java/android/content" dest="frameworks/base/core/java/android/content" />
<linkfile src="core/java/android/security" dest="frameworks/base/core/java/android/security" />
</project> />
<!-- Custom busybox no longer needed, but will keep here for reference -->
<!-- <project path="external/busybox" name="TeamWin/android_external_busybox" remote="github" revision="android-8.0" /> -->
</project>
<!-- Use OmniROM busybox -->
<project path="external/busybox" name="android_external_busybox" remote="omnirom" revision="android-8.1" />
<!-- Include external Magisk repo for repack binaries -->
<project path="external/magisk-prebuilt" name="TeamWin/external_magisk-prebuilt" remote="github" revision="master" />
<project path="external/magisk-prebuilt" name="external_magisk-prebuilt" remote="TeamWin" revision="master" />
</manifest>