manifest: android-6.0.1_r81

This also reverts:

"Merge commit 'bbc9221' into master"
commit 243bbc686a8a20fbd70458da88ebb424a2f6ca40
(point external/sfntly back to aosp)

"Merge remote-tracking branch 'aosp/upstream-master' into master"
commit e78924fc97e4383be020fa7f51faa4f457fe2343
(point external/sfntly back to aosp)

"DO NOT MERGE - fix FTS3 column pointer handling"
commit b0216e4fbbb4690f534a9d3c0374aadd22940e47
(point external/sqlite back to aosp)

Further, point external/libavc back to aosp

Mentioned repos were updated in android-6.0.1_r81,
we don't have additions.

Change-Id: I9f525d824f9f5257d1b887f873a61912267657bf
This commit is contained in:
MSe 2017-10-04 21:58:37 +02:00
parent 90ca7d7ebf
commit 6510735c44

View File

@ -4,7 +4,7 @@
<remote name="aosp"
fetch="https://android.googlesource.com"
review="android-review.googlesource.com"
revision="refs/tags/android-6.0.1_r80" />
revision="refs/tags/android-6.0.1_r81" />
<remote name="github"
fetch=".."
@ -84,7 +84,6 @@
<project path="external/jsr305" name="LineageOS/android_external_jsr305" groups="pdk-cw-fs,pdk-fs" />
<project path="external/koush/AndroidAsync" name="LineageOS/AndroidAsync" />
<project path="external/koush/ion" name="LineageOS/ion" />
<project path="external/libavc" name="LineageOS/android_external_libavc" groups="pdk" />
<project path="external/libhevc" name="LineageOS/android_external_libhevc" groups="pdk-fs" />
<project path="external/libmpeg2" name="LineageOS/android_external_libmpeg2" groups="pdk" />
<project path="external/libncurses" name="LineageOS/android_external_libncurses" />
@ -121,12 +120,10 @@
<project path="external/protobuf-c" name="LineageOS/android_external_protobuf-c" />
<project path="external/rsync" name="LineageOS/android_external_rsync" />
<project path="external/sepolicy" name="LineageOS/android_external_sepolicy" groups="pdk" />
<project path="external/sfntly" name="LineageOS/android_external_sfntly" groups="pdk,qcom_msm8x26" />
<project path="external/skia" name="LineageOS/android_external_skia" groups="pdk,qcom_msm8x26" />
<project path="external/sonivox" name="LineageOS/android_external_sonivox" groups="pdk" />
<project path="external/speex" name="LineageOS/android_external_speex" groups="pdk" />
<project path="external/spongycastle" name="LineageOS/android_external_spongycastle" groups="pdk" />
<project path="external/sqlite" name="LineageOS/android_external_sqlite" groups="pdk" />
<project path="external/stagefright-plugins" name="LineageOS/android_external_stagefright-plugins" />
<project path="external/strace" name="LineageOS/android_external_strace" groups="pdk-cw-fs,pdk-fs" />
<project path="external/tcpdump" name="LineageOS/android_external_tcpdump" groups="pdk,pdk-cw-fs,pdk-fs" />
@ -386,6 +383,7 @@
<project path="external/junit" name="platform/external/junit" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/kernel-headers" name="platform/external/kernel-headers" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/ksoap2" name="platform/external/ksoap2" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/libavc" name="platform/external/libavc" groups="pdk" remote="aosp" />
<project path="external/libcap-ng" name="platform/external/libcap-ng" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/libcxx" name="platform/external/libcxx" groups="pdk" remote="aosp" />
<project path="external/libcxxabi" name="platform/external/libcxxabi" groups="pdk" remote="aosp" />
@ -446,9 +444,11 @@
<project path="external/safe-iop" name="platform/external/safe-iop" groups="pdk" remote="aosp" />
<project path="external/scrypt" name="platform/external/scrypt" groups="pdk" remote="aosp" />
<project path="external/selinux" name="platform/external/selinux" groups="pdk" remote="aosp" />
<project path="external/sfntly" name="platform/external/sfntly" groups="pdk,qcom_msm8x26" remote="aosp" />
<project path="external/slf4j" name="platform/external/slf4j" groups="pdk-fs" remote="aosp" />
<project path="external/smali" name="platform/external/smali" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/sonic" name="platform/external/sonic" groups="pdk" remote="aosp" />
<project path="external/sqlite" name="platform/external/sqlite" groups="pdk" remote="aosp" />
<project path="external/squashfs-tools" name="platform/external/squashfs-tools" groups="pdk" remote="aosp" />
<project path="external/srtp" name="platform/external/srtp" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
<project path="external/svox" name="platform/external/svox" groups="pdk-cw-fs,pdk-fs" remote="aosp" />