asgardius/platform_manifest_twrp_omni
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'android-6.0' of https://github.com/omnirom/android into omnirom-android-6.0

Browse source 
Conflicts:
	default.xml
This commit is contained in:
lj50036 2016-12-23 22:20:36 -06:00
commit f69285c0ad
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default.xml
View file

@ -19,7 +19,7 @@
review="gerrit.twrp.me"
fetch="https://github.com/TeamWin" />
<default revision="refs/tags/android-6.0.1_r46"
<default revision="refs/tags/android-6.0.1_r74"
remote="aosp"
sync-c="true"
sync-j="4" />
@ -89,9 +89,9 @@
<!-- project path="external/crcalc" name="platform/external/crcalc" groups="pdk-fs" /> -->
<!-- project path="external/deqp" name="platform/external/deqp" groups="pdk-fs" /> -->
<!-- project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/dhcpcd" name="platform/external/dhcpcd" groups="pdk-cw-fs,pdk-fs" /> -->
<!--project path="external/dhcpcd" name="android_external_dhcpcd" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/dnsmasq" name="platform/external/dnsmasq" groups="pdk" /> -->
<!-- project path="external/doclava" name="platform/external/doclava" groups="pdk-cw-fs,pdk-fs" /> -->
<!--project path="external/doclava" name="android_external_doclava" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/donuts" name="platform/external/donuts" groups="pdk-fs" /> -->
<!-- project path="external/drm_gralloc" name="platform/external/drm_gralloc" groups="drm_gralloc" /> -->
<!-- project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" /> -->
@ -126,7 +126,7 @@
<!-- project path="external/google-tv-pairing-protocol" name="platform/external/google-tv-pairing-protocol" groups="pdk-fs" /> -->
<project path="external/gptfdisk" name="platform/external/gptfdisk" groups="pdk-fs" />
<!-- project path="external/gtest" name="platform/external/gtest" groups="pdk" /> -->
<!-- project path="external/guava" name="platform/external/guava" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/guava" name="android_external_guava" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/hamcrest" name="platform/external/hamcrest" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/harfbuzz_ng" name="platform/external/harfbuzz_ng" groups="pdk,qcom_msm8x26" /> -->
<!-- project path="external/hyphenation-patterns" name="platform/external/hyphenation-patterns" groups="pdk-fs" /> -->
@ -193,7 +193,7 @@
<project path="external/llvm" name="android_external_llvm" remote="omnirom" revision="android-6.0" groups="pdk" />
<project path="external/ltrace" name="platform/external/ltrace" groups="pdk-cw-fs,pdk-fs" />
<project path="external/lz4" name="android_external_lz4" remote="omnirom" revision="android-6.0" groups="pdk-cw-fs,pdk-fs" />
<project path="external/lzma" name="platform/external/lzma" groups="pdk" />
<project path="external/lzma" name="android_external_lzma" remote="omnirom" revision="android-6.0" groups="pdk" />
<!-- project path="external/marisa-trie" name="platform/external/marisa-trie" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/markdown" name="platform/external/markdown" groups="pdk-cw-fs,pdk-fs" /> -->
<!-- project path="external/mdnsresponder" name="platform/external/mdnsresponder" groups="pdk" /> -->
@ -375,7 +375,7 @@
<!-- project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-6.0" /> -->
<!-- project path="packages/apps/LegacyCamera" name="platform/packages/apps/LegacyCamera" /> -->
<!-- project path="packages/apps/ManagedProvisioning" name="platform/packages/apps/ManagedProvisioning" /> -->
<!-- project path="packages/apps/Messaging" name="platform/packages/apps/Messaging" groups="pdk-fs" /> -->
<!-- project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-6.0" /> -->
<!-- project path="packages/apps/MusicFX" name="platform/packages/apps/MusicFX" /> -->
<!-- project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-6.0" /> -->
<!-- project path="packages/apps/OmniGears" name="android_packages_apps_OmniGears" remote="omnirom" revision="android-6.0" /> -->