Merge "[DNM] Revert "Revert "Revert "manifest: bring back chromium-webview"""" into android-10
diff --git a/README.md b/README.md
index ab8c6d8..8cee880 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
<make edits>
git add -A
git commit -m "commit message"
- git push ssh://<username>@gerrit.omnirom.org:29418/<project> HEAD:refs/for/android-9.0
+ git push ssh://<username>@gerrit.omnirom.org:29418/<project> HEAD:refs/for/android-10
Register at <gerrit.omnirom.org> and use the username that you registered there in the above command
@@ -58,7 +58,7 @@
To initialize your local repository using the OmniROM trees, use a command like this:
- repo init -u git://github.com/omnirom/android.git -b android-9.0
+ repo init -u git://github.com/omnirom/android.git -b android-10
Then to sync up:
diff --git a/default.xml b/default.xml
index 54fe58e..b8b1889 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
<remote name="aosp"
fetch="https://android.googlesource.com"
review="https://android-review.googlesource.com/" />
- <default revision="refs/tags/android-10.0.0_r14"
+ <default revision="refs/tags/android-10.0.0_r29"
remote="aosp"
sync-c="true"
sync-j="12" />
@@ -33,9 +33,6 @@
<project path="developers/demos" name="platform/developers/demos" groups="developers" />
<project path="developers/samples/android" name="platform/developers/samples/android" groups="developers" />
<project path="development" name="platform/development" groups="developers,pdk-cw-fs,pdk-fs" />
- <!--
- : Don"t clog up git with lots of binaries but allow to revert single kernel revision to help diagnose issues.
- -->
<project path="device/amlogic/yukawa" name="device/amlogic/yukawa" groups="device,yukawa,pdk" />
<project path="device/amlogic/yukawa-kernel" name="device/amlogic/yukawa-kernel" groups="device,yukawa,pdk" clone-depth="1" />
<project path="device/common" name="device/common" groups="pdk-cw-fs,pdk" />
@@ -242,6 +239,7 @@
<project path="external/libevent" name="platform/external/libevent" groups="pdk" />
<project path="external/libexif" name="platform/external/libexif" groups="pdk" />
<project path="external/libffi" name="platform/external/libffi" groups="pdk" />
+ <project path="external/libgav1" name="platform/external/libgav1" groups="pdk" />
<project path="external/libgsm" name="platform/external/libgsm" groups="pdk" />
<project path="external/libhevc" name="platform/external/libhevc" groups="pdk" />
<project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="pdk" />
@@ -300,9 +298,7 @@
<project path="external/nfacct" name="platform/external/nfacct" groups="pdk" />
<project path="external/nist-pkits" name="platform/external/nist-pkits" groups="pdk" />
<project path="external/nist-sip" name="platform/external/nist-sip" groups="pdk" />
- <project path="external/nos/host/android" name="platform/external/nos/host/android" groups="pixel" />
<project path="external/nos/host/generic" name="platform/external/nos/host/generic" groups="pixel" />
- <project path="external/nos/test/system-test-harness" name="platform/external/nos/test/system-test-harness" groups="pixel" />
<project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" />
<project path="external/oauth" name="platform/external/oauth" groups="pdk" />
<project path="external/objenesis" name="platform/external/objenesis" groups="pdk" />
@@ -491,6 +487,7 @@
<project path="hardware/google/easel" name="platform/hardware/google/easel" groups="pdk,easel" />
<project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk" />
<project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="generic_fs,pixel" />
+ <project path="hardware/google/pixel-sepolicy" name="platform/hardware/google/pixel-sepolicy" groups="generic_fs,pixel" />
<project path="hardware/interfaces" name="platform/hardware/interfaces" groups="pdk" />
<project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense,pdk" />
<project path="hardware/knowles/athletico/sound_trigger_hal" name="platform/hardware/knowles/athletico/sound_trigger_hal" groups="coral" />
@@ -617,7 +614,7 @@
<project path="packages/apps/TV" name="platform/packages/apps/TV" groups="pdk" />
<project path="packages/apps/UnifiedEmail" name="platform/packages/apps/UnifiedEmail" groups="pdk-fs" />
<project path="packages/apps/UniversalMediaPlayer" name="platform/packages/apps/UniversalMediaPlayer" />
- <project path="packages/apps/WallpaperPicker" name="platform/packages/apps/WallpaperPicker" groups="pdk-fs" />
+ <project path="packages/apps/WallpaperPicker" name="platform/packages/apps/WallpaperPicker" groups="pdk-fs" />
<project path="packages/apps/WallpaperPicker2" name="platform/packages/apps/WallpaperPicker2" groups="pdk-fs" />
<project path="packages/inputmethods/LatinIME" name="platform/packages/inputmethods/LatinIME" groups="pdk-fs" />
<project path="packages/modules/CaptivePortalLogin" name="platform/packages/modules/CaptivePortalLogin" groups="pdk-cw-fs,pdk-fs" />
@@ -784,6 +781,7 @@
<project path="tools/tradefederation/core" name="platform/tools/tradefederation" groups="pdk,tradefed" />
<project path="tools/tradefederation/contrib" name="platform/tools/tradefederation/contrib" groups="pdk,tradefed" />
<project path="tools/trebuchet" name="platform/tools/trebuchet" groups="tools,cts,pdk,pdk-cw-fs,pdk-fs" />
+
<repo-hooks in-project="platform/tools/repohooks" enabled-list="pre-upload" />
<!-- OmniROM -->
<include name="omni-default.xml" />
diff --git a/omni-aosp.xml b/omni-aosp.xml
index f3f8a74..3bdf734 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -42,6 +42,7 @@
<project path="frameworks/av" name="android_frameworks_av" remote="omnirom" revision="android-10" />
<project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-10" />
<project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-10" />
+ <project path="frameworks/opt/chips" name="android_frameworks_opt_chips" remote="omnirom" revision="android-10" />
<project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-10" />
<project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-10" /> -->
<project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-10" />
@@ -52,7 +53,7 @@
<project path="hardware/libhardware_legacy" name="android_hardware_libhardware_legacy" remote="omnirom" revision="android-10" groups="pdk" />
<project path="hardware/nxp/nfc" name="android_hardware_nxp_nfc" remote="omnirom" revision="android-10" />
-
+
<!--<project path="hardware/qcom/audio" name="android_hardware_qcom_audio" remote="omnirom" revision="android-9.0" /> -->
<!-- <project path="hardware/qcom/bt" name="android_hardware_qcom_bt" remote="omnirom" revision="android-9.0" /> -->
<!--<project path="hardware/qcom/display" name="android_hardware_qcom_display" remote="omnirom" revision="android-9.0" /> -->
@@ -74,17 +75,19 @@
<project path="packages/apps/Messaging" name="android_packages_apps_Messaging" remote="omnirom" revision="android-10" />
<project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-10" />
<project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-10" />
+ <project path="packages/apps/PackageInstaller" name="android_packages_apps_PackageInstaller" remote="omnirom" revision="android-10" />
<project path="packages/apps/PhoneCommon" name="android_packages_apps_PhoneCommon" remote="omnirom" revision="android-10" />
<project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-10" />
<project path="packages/apps/SettingsIntelligence" name="android_packages_apps_SettingsIntelligence" remote="omnirom" revision="android-10" />
<!--<project path="packages/apps/Stk" name="android_packages_apps_Stk" remote="omnirom" revision="android-9.0" /> -->
- <!--<project path="packages/apps/Tag" name="android_packages_apps_Tag" remote="omnirom" revision="android-9.0" /> -->
+ <!--<project path="packages/apps/Tag" name="android_packages_apps_Tag" remote="omnirom" revision="android-9.0" /> -->
<project path="packages/apps/ThemePicker" name="android_packages_apps_ThemePicker" remote="omnirom" revision="android-10" />
<project path="packages/apps/WallpaperPicker2" name="android_packages_apps_WallpaperPicker2" remote="omnirom" revision="android-10" />
<project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-10" />
<project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" remote="omnirom" revision="android-10" />
+ <project path="packages/providers/MediaProvider" name="android_packages_providers_MediaProvider" remote="omnirom" revision="android-10" />
<project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-10" />
<project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-10" />
diff --git a/omni-default.xml b/omni-default.xml
index 9721fcc..28c6eda 100644
--- a/omni-default.xml
+++ b/omni-default.xml
@@ -23,6 +23,8 @@
<!--<project path="external/openssh" name="android_external_openssh" remote="omnirom" revision="android-9.0" />-->
<!--<project path="external/powertop" name="android_external_powertop" remote="omnirom" revision="android-9.0" />-->
<!--<project path="external/rsync" name="android_external_rsync" remote="omnirom" revision="android-9.0" />-->
+ <project path="external/tigervnc" name="android_external_tigervnc" remote="omnirom" revision="android-10" />
+ <project path="external/vncflinger" name="android_external_vncflinger" remote="omnirom" revision="android-10" />
<project path="external/vim" name="android_external_vim" remote="omnirom" revision="android-10" />
<project path="external/zip" name="android_external_zip" remote="omnirom" revision="android-10" />
@@ -34,7 +36,8 @@
<project path="packages/apps/OmniLib" name="android_packages_apps_OmniLib" remote="omnirom" revision="android-10" />
<!--<project path="packages/apps/OmniBrain" name="android_packages_apps_OmniBrain" remote="omnirom" revision="android-9.0" />-->
<project path="packages/services/OmniJaws" name="android_packages_services_OmniJaws" remote="omnirom" revision="android-10" />
- <project path="packages/apps/OmniRecord" name="android_packages_apps_OmniRecord" remote="omnirom" revision="android-10" />
+<!-- <project path="packages/apps/OmniRecord" name="android_packages_apps_OmniRecord" remote="omnirom" revision="android-10" /> -->
+ <project path="packages/apps/OmniRemote" name="android_packages_apps_OmniRemote" remote="omnirom" revision="android-10" />
<project path="packages/apps/OmniStyle" name="android_packages_apps_OmniStyle" remote="omnirom" revision="android-10" />
<project path="packages/apps/OmniSwitch" name="android_packages_apps_OmniSwitch" remote="omnirom" revision="android-10" />
<project path="packages/apps/OpenDelta" name="android_packages_apps_OpenDelta" remote="omnirom" revision="android-10" />
diff --git a/remove.xml b/remove.xml
index 2d05711..2b667cc 100644
--- a/remove.xml
+++ b/remove.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
-
- <remove-project name="device/generic/uml" />
-
<remove-project name="platform/art" />
<remove-project name="platform/bionic" />
<remove-project name="platform/build" />
@@ -20,11 +17,17 @@
<remove-project name="device/generic/arm64" />
<remove-project name="device/generic/armv7-a-neon" />
<remove-project name="device/generic/car" />
+ <remove-project name="device/generic/common" />
+ <remove-project name="device/generic/goldfish" />
+ <remove-project name="device/generic/goldfish-opengl" />
<remove-project name="device/generic/mini-emulator-arm64" />
<remove-project name="device/generic/mini-emulator-armv7-a-neon" />
<remove-project name="device/generic/mini-emulator-x86" />
<remove-project name="device/generic/mini-emulator-x86_64" />
+ <remove-project name="device/generic/opengl-transport" />
<remove-project name="device/generic/qemu" />
+ <remove-project name="device/generic/trusty" />
+ <remove-project name="device/generic/uml" />
<remove-project name="device/generic/x86" />
<remove-project name="device/generic/x86_64" />
<remove-project name="device/google/atv" />
@@ -76,6 +79,7 @@
<remove-project name="platform/frameworks/av" />
<remove-project name="platform/frameworks/base" />
<remove-project name="platform/frameworks/native" />
+ <remove-project name="platform/frameworks/opt/chips" />
<remove-project name="platform/frameworks/opt/telephony" />
<remove-project name="platform/frameworks/opt/net/ims" />
<remove-project name="platform/frameworks/opt/net/wifi" />
@@ -87,6 +91,7 @@
<remove-project name="platform/hardware/nxp/nfc" />
+ <remove-project name="platform/hardware/google/pixel-sepolicy" />
<remove-project name="platform/hardware/qcom/audio" />
<remove-project name="platform/hardware/qcom/camera" />
<remove-project name="platform/hardware/qcom/data/ipacfg-mgr" />
@@ -128,6 +133,7 @@
<remove-project name="platform/packages/apps/Music" />
<remove-project name="platform/packages/apps/MusicFX" />
<remove-project name="platform/packages/apps/Nfc" />
+ <remove-project name="platform/packages/apps/PackageInstaller" />
<remove-project name="platform/packages/apps/PhoneCommon" />
<remove-project name="platform/packages/apps/Settings" />
<remove-project name="platform/packages/apps/SettingsIntelligence" />
@@ -140,6 +146,7 @@
<remove-project name="platform/packages/inputmethods/LatinIME" />
<remove-project name="platform/packages/providers/DownloadProvider" />
+ <remove-project name="platform/packages/providers/MediaProvider" />
<remove-project name="platform/packages/services/Telephony" />
<remove-project name="platform/packages/services/Telecomm" />