Minimal TWRP: Add/Replace needed libs for FBE as well as busybox

* Addresses the problems mentioned in
  70da2068a8
  1) system/keymaster and system/security are replaced by
     AOSP-android-8.0.0_r34 versions
  2) weaver and libkeyutils get synced to a staging directory
     then symlinked to the proper destination directories

* Comment out the removal of android_frameworks_base

* Add TeamWin's android-8.0 busybox
This commit is contained in:
nkk71 2017-12-05 14:43:48 +02:00
parent 70da2068a8
commit f17d2ccdbc
2 changed files with 33 additions and 0 deletions

View file

@ -409,7 +409,9 @@
but syncing a 1GB repo for 4 to 5MB is not worth
it for me.
-->
<!--
<remove-project name="android_frameworks_base" />
-->
<remove-project name="android_frameworks_opt_telephony" />
@ -454,4 +456,8 @@
<remove-project name="android_packages_apps_OpenDelta" />
<remove-project name="android_packages_apps_Phonograph" />
<!-- LAST: Add/Replace repos and particular directories needed by TWRP -->
<include name="twrp-minimal-extras.xml" />
</manifest>

27
twrp-minimal-extras.xml Normal file
View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<!-- 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 -->
<project path="TeamWin/AOSP/hardware/interfaces" name="platform/hardware/interfaces" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
<!-- TeamWin/AOSP is just a staging directory -->
<linkfile src="weaver" dest="hardware/interfaces/weaver" />
</project>
<!-- libkeyutils.so -->
<project path="TeamWin/AOSP/system/core" name="platform/system/core" remote="aosp" revision="refs/tags/android-8.0.0_r34" >
<!-- TeamWin/AOSP is just a staging directory -->
<linkfile src="libkeyutils" dest="system/core/libkeyutils" />
</project>
<!-- busybox -->
<project path="external/busybox" name="TeamWin/android_external_busybox" remote="github" revision="android-8.0" />
</manifest>