Merge remote tracking branch 'omnirom/android-7.1' into twrp-7.1
* HEAD at 6340a19
: "add Interfacer package"
Change-Id: Iddb335663092a81869d346769517e9251a637575
This commit is contained in:
commit
ae490e8a51
6 changed files with 26 additions and 4 deletions
|
@ -9,7 +9,7 @@ Contact @lj50036 on irc, Network: freenode, Channel: #twrp
|
|||
|
||||
## Maintaining Authorship ##
|
||||
----------------------
|
||||
Mainting authorship is a very important aspect of working with Open Source code. If you wish to submit a patch/fix
|
||||
Maintaining authorship is a very important aspect of working with Open Source code. If you wish to submit a patch/fix
|
||||
from anywhere else (another ROM, project, etc.), it is imperative that you maintain the ownership of the person whose
|
||||
work you're seeking to include. Doing so will ensure that credit is given where it is deserved, and the [prinicples of open source](http://opensource.org/docs/osd)
|
||||
are upheld. Your contribution to the project will still be recognized as you will forever be listed as the committer.
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<remote name="aosp"
|
||||
fetch="https://android.googlesource.com"
|
||||
review="android-review.googlesource.com" />
|
||||
<default revision="refs/tags/android-7.1.0_r7"
|
||||
<default revision="refs/tags/android-7.1.1_r24"
|
||||
remote="aosp"
|
||||
sync-c="true"
|
||||
sync-j="4" />
|
||||
|
@ -35,6 +35,7 @@
|
|||
<project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
|
||||
<project path="device/generic/common" name="device/generic/common" groups="pdk" />
|
||||
<project path="device/generic/goldfish" name="device/generic/goldfish" groups="pdk" />
|
||||
<project path="device/generic/goldfish-opengl" name="device/generic/goldfish-opengl" groups="pdk" />
|
||||
<project path="device/generic/mips" name="device/generic/mips" groups="pdk" />
|
||||
<project path="device/generic/mips64" name="device/generic/mips64" groups="pdk" />
|
||||
<project path="device/generic/mini-emulator-arm64" name="device/generic/mini-emulator-arm64" groups="pdk" />
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
<project path="external/tinyalsa" name="android_external_tinyalsa" remote="omnirom" revision="android-7.1" groups="pdk" />
|
||||
<project path="external/tinycompress" name="android_external_tinycompress" remote="omnirom" revision="android-7.1" groups="pdk" />
|
||||
<project path="external/toybox" name="android_external_toybox" remote="omnirom" revision="android-7.1" groups="pdk" />
|
||||
<project path="external/svox" name="android_external_svox" remote="omnirom" revision="android-7.1" groups="pdk-cw-fs,pdk-fs"/>
|
||||
|
||||
<project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-7.1" groups="pdk" />
|
||||
<project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-7.1" groups="pdk-cw-fs" />
|
||||
|
@ -80,6 +81,7 @@
|
|||
<project path="packages/apps/QuickSearchBox" name="android_packages_apps_QuickSearchBox" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/UnifiedEmail" name="android_packages_apps_UnifiedEmail" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/WallpaperPicker" name="android_packages_apps_WallpaperPicker" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" remote="omnirom" revision="android-7.1" groups="pdk-cw-fs" />
|
||||
<project path="packages/providers/MediaProvider" name="android_packages_providers_MediaProvider" remote="omnirom" revision="android-7.1" groups="pdk-cw-fs" />
|
||||
|
|
13
omni-caf.xml
Normal file
13
omni-caf.xml
Normal file
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<manifest>
|
||||
|
||||
<remote name="github"
|
||||
fetch="https://github.com/" />
|
||||
|
||||
<remote name="omnirom"
|
||||
fetch="https://github.com/omnirom"
|
||||
review="gerrit.omnirom.org" />
|
||||
|
||||
<project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-7.1" />
|
||||
<project path="vendor/codeaurora/telephony" name="android_vendor_codeaurora_telephony" remote="omnirom" revision="android-7.1" />
|
||||
</manifest>
|
|
@ -6,6 +6,9 @@
|
|||
<!-- Include forked AOSP -->
|
||||
<include name="omni-aosp.xml" />
|
||||
|
||||
<!-- Include forked CAF -->
|
||||
<include name="omni-caf.xml" />
|
||||
|
||||
<!-- OmniROM Projects -->
|
||||
<project path="android" name="android" remote="omnirom" revision="android-7.1" />
|
||||
|
||||
|
@ -17,9 +20,9 @@
|
|||
<project path="external/ntfs-3g" name="android_external_ntfs-3g" remote="omnirom" revision="android-7.1"/>
|
||||
|
||||
<project path="packages/apps/Apollo" name="android_packages_apps_Apollo" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/DeskClock" name="android_packages_apps_DeskClock" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/DSPManager" name="android_packages_apps_DSPManager" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/Interfacer" name="android_packages_apps_Interfacer" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/MonthCalendarWidget" name="android_packages_apps_MonthCalendarWidget" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/OmniClock" name="android_packages_apps_OmniClock" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-7.1" />
|
||||
|
@ -27,7 +30,6 @@
|
|||
<project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/OpenDelta" name="android_packages_apps_OpenDelta" remote="omnirom" revision="android-7.1" />
|
||||
<project path="packages/apps/PerformanceControl" name="android_packages_apps_PerformanceControl" remote="omnirom" revision="android-7.1" />
|
||||
<project path="vendor/omni" name="android_vendor_omni2" remote="omnirom" revision="android-7.1" />
|
||||
|
||||
</manifest>
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
<remove-project name="platform/external/tinyalsa" />
|
||||
<remove-project name="platform/external/tinycompress" />
|
||||
<remove-project name="platform/external/toybox" />
|
||||
<remove-project name="platform/external/svox"/>
|
||||
|
||||
<remove-project name="platform/frameworks/av" />
|
||||
<remove-project name="platform/frameworks/base" />
|
||||
|
@ -113,7 +114,9 @@
|
|||
<remove-project name="platform/packages/apps/DeskClock" />
|
||||
<remove-project name="platform/packages/apps/Dialer" />
|
||||
<remove-project name="platform/packages/apps/Email" />
|
||||
<remove-project name="platform/packages/apps/Gallery" />
|
||||
<remove-project name="platform/packages/apps/Gallery2" />
|
||||
<remove-project name="platform/packages/apps/Launcher2" />
|
||||
<remove-project name="platform/packages/apps/Launcher3" />
|
||||
<remove-project name="platform/packages/apps/Messaging" />
|
||||
<remove-project name="platform/packages/apps/Music" />
|
||||
|
@ -125,6 +128,7 @@
|
|||
<remove-project name="platform/packages/apps/Settings" />
|
||||
<remove-project name="platform/packages/apps/UnifiedEmail" />
|
||||
<remove-project name="platform/packages/inputmethods/LatinIME" />
|
||||
<remove-project name="platform/packages/inputmethods/OpenWnn" />
|
||||
<remove-project name="platform/packages/providers/DownloadProvider" />
|
||||
<remove-project name="platform/packages/providers/MediaProvider" />
|
||||
<remove-project name="platform/packages/providers/TelephonyProvider" />
|
||||
|
|
Loading…
Reference in a new issue