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

Change-Id: Iea06e7c92f5c344c7021cbe3d681ee2e6a42f5ad
This commit is contained in:
Captain Throwback 2018-07-16 12:32:28 -04:00
commit c7dd64bc53
4 changed files with 8 additions and 3 deletions

View File

@ -3,7 +3,7 @@
<remote name="aosp" <remote name="aosp"
fetch="https://android.googlesource.com" fetch="https://android.googlesource.com"
review="https://android-review.googlesource.com/" /> review="https://android-review.googlesource.com/" />
<default revision="refs/tags/android-8.1.0_r32" <default revision="refs/tags/android-8.1.0_r40"
remote="aosp" remote="aosp"
sync-c="true" sync-c="true"
sync-j="12" /> sync-j="12" />

View File

@ -4,10 +4,14 @@
<remote name="github" <remote name="github"
fetch="https://github.com/" /> fetch="https://github.com/" />
<remote name="gitlab"
fetch="https://gitlab.com/" />
<remote name="omnirom" <remote name="omnirom"
fetch="https://github.com/omnirom" fetch="https://github.com/omnirom"
review="gerrit.omnirom.org" /> review="gerrit.omnirom.org" />
<project path="art" name="android_art" remote="omnirom" revision="android-8.1" groups="pdk" />
<project path="bionic" name="android_bionic" remote="omnirom" revision="android-8.1" groups="pdk" /> <project path="bionic" name="android_bionic" remote="omnirom" revision="android-8.1" groups="pdk" />
<project path="build/make" name="android_build" remote="omnirom" revision="android-8.1" groups="pdk" > <project path="build/make" name="android_build" remote="omnirom" revision="android-8.1" groups="pdk" >

View File

@ -2,7 +2,6 @@
<manifest> <manifest>
<!-- Remove from default.xml --> <!-- Remove from default.xml -->
<remove-project name="platform/art" />
<remove-project name="platform/compatibility/cdd" /> <remove-project name="platform/compatibility/cdd" />
<remove-project name="platform/cts" /> <remove-project name="platform/cts" />
<remove-project name="platform/dalvik" /> <remove-project name="platform/dalvik" />
@ -394,6 +393,7 @@
<!-- Remove from omni-aosp.xml (forked AOSP) --> <!-- Remove from omni-aosp.xml (forked AOSP) -->
<remove-project name="android_art" />
<remove-project name="android_development" /> <remove-project name="android_development" />
<remove-project name="android_external_aac" /> <remove-project name="android_external_aac" />

View File

@ -8,6 +8,7 @@
<remove-project name="device/google/wahoo" /> <remove-project name="device/google/wahoo" />
<remove-project name="device/google/wahoo-kernel" /> <remove-project name="device/google/wahoo-kernel" />
<remove-project name="platform/art" />
<remove-project name="platform/bionic" /> <remove-project name="platform/bionic" />
<remove-project name="platform/build" /> <remove-project name="platform/build" />
<remove-project name="platform/build/soong" /> <remove-project name="platform/build/soong" />