Merge commit 'e0b1224ea301ed33b1202129d204f8cac2f3285c' into default
* commit 'e0b1224ea301ed33b1202129d204f8cac2f3285c':
Add project for minijail.
Create 'wifitv' branch.
Change-Id: I2ba64aaab2fc5509b9d02c11ba288cea19f83f86
diff --git a/default.xml b/default.xml
index d790e7d..bcb7685 100644
--- a/default.xml
+++ b/default.xml
@@ -1,80 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
- <remote
- name="gfiber-internal"
- fetch="https://gfiber-internal.googlesource.com/"
- review="https://gfiber-internal-review.googlesource.com/"/>
- <default
- remote="gfiber-internal"
- revision="refs/heads/master"
- sync-j="12"/>
-
<include name="default_unrestricted.xml"/>
-
- <project name="chromium"/>
- <project name="chromium/src2" path="chromium/src"/>
- <project name="chromium/src/breakpad/src"/>
- <project name="chromium/src/cast"/>
- <project name="chromium/src/chromecast/internal"/>
- <project name="chromium/src/chromecast/internal/cdm/widevine"/>
- <project name="chromium/src/chromecast/internal/vendor/fiber"/>
- <project name="chromium/src/fiber"/>
- <project name="chromium/src/ozone-nexus"/>
- <project name="chromium/src/sdch/open-vcdiff"/>
- <project name="chromium/src/testing/gmock"/>
- <project name="chromium/src/testing/gtest"/>
- <project name="chromium/src/third_party/angle"/>
- <project name="chromium/src/third_party/boringssl/src"/>
- <project name="chromium/src/third_party/cacheinvalidation/src"/>
- <project name="chromium/src/third_party/dom_distiller_js/dist"/>
- <project name="chromium/src/third_party/ffmpeg"/>
- <project name="chromium/src/third_party/flac"/>
- <project name="chromium/src/third_party/fontconfig/src"/>
- <project name="chromium/src/third_party/freetype2/src"/>
- <project name="chromium/src/third_party/icu"/>
- <project name="chromium/src/third_party/leveldatabase/src"/>
- <project name="chromium/src/third_party/libaddressinput/src"/>
- <project name="chromium/src/third_party/libjingle/source/talk"/>
- <project name="chromium/src/third_party/libjpeg_turbo"/>
- <project name="chromium/src/third_party/libvpx"/>
- <project name="chromium/src/third_party/libyuv"/>
- <project name="chromium/src/third_party/lss"/>
- <project name="chromium/src/third_party/mesa/src"/>
- <project name="chromium/src/third_party/openmax_dl"/>
- <project name="chromium/src/third_party/opus/src"/>
- <project name="chromium/src/third_party/skia"/>
- <project name="chromium/src/third_party/smhasher/src"/>
- <project name="chromium/src/third_party/snappy/src"/>
- <project name="chromium/src/third_party/trace-viewer"/>
- <project name="chromium/src/third_party/WebKit"/>
- <project name="chromium/src/third_party/webrtc"/>
- <project name="chromium/src/third_party/yasm/source/patched-yasm"/>
- <project name="chromium/src/tools/grit"/>
- <project name="chromium/src/tools/gyp"/>
- <project name="chromium/src/v8"/>
-
- <project name="google_cast"/>
-
- <project name="vendor/broadcom/AppLibs"/>
- <project name="vendor/broadcom/BSEAV"/>
- <project name="vendor/broadcom/directfb"/>
- <project name="vendor/broadcom/magnum"/>
- <project name="vendor/broadcom/miracast"/>
- <project name="vendor/broadcom/netflix"/>
- <project name="vendor/broadcom/nexus"/>
- <project name="vendor/broadcom/rockford"/>
- <project name="vendor/broadcom/trellis"/>
- <project name="vendor/broadcom/vudu"/>
- <project name="vendor/broadcom/webkit"/>
-
- <project name="vendor/google/glfw_nexus"/>
- <project name="vendor/google/hdcp"/>
-
- <project name="vendor/hfw/glaukus-hal"/>
- <project name="vendor/hfw/glaukus-linkman"/>
- <project name="vendor/hfw/surprise_diagnostics"/>
-
- <project name="vendor/netflix/nrd"/>
-
- <project name="vendor/sagetv/miniclient"/>
</manifest>
diff --git a/default_unrestricted.xml b/default_unrestricted.xml
index adf9711..556a615 100644
--- a/default_unrestricted.xml
+++ b/default_unrestricted.xml
@@ -1,25 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<remote
- name="gfiber-internal"
- fetch="https://gfiber-internal.googlesource.com/"
- review="https://gfiber-internal-review.googlesource.com/"/>
+ name="origin"
+ fetch="https://gfiber.googlesource.com/"
+ review="https://gfiber-review.googlesource.com/"/>
<default
- remote="gfiber-internal"
+ remote="origin"
revision="refs/heads/master"
- sync-j="12"/>
- <manifest-server
- url="http://gfiber-buildbot.cbf.corp.google.com:8080/"/>
+ sync-j="3"/>
<project name="barebox/mindspeed"/>
<project name="buildroot"/>
<project name="kernel/bruno"/>
- <project name="kernel/bruno" path="kernel/bruno_arm" revision="refs/heads/brcm_apr_2015"/>
<project name="kernel/bruno" path="kernel/bruno_new" revision="refs/heads/newkernel_dev"/>
<project name="kernel/mindspeed" revision="refs/heads/newkernel-4.1"/>
<project name="kernel/mindspeed" path="kernel/mindspeed-3.2" revision="refs/heads/master"/>
<project name="kernel/prism"/>
- <project name="kernel/skids"/>
<project name="kernel/windcharger"/>
<project name="toolchains/armada"/>
<project name="toolchains/bruno"/>
@@ -27,28 +23,13 @@
<project name="toolchains/kvm"/>
<project name="toolchains/mindspeed"/>
<project name="toolchains/prism"/>
- <project name="toolchains/skids"/>
<project name="toolchains/windcharger"/>
<project name="uboot/armada"/>
- <project name="uboot/mindspeed"/>
<project name="uboot/prism"/>
<project name="uboot/windcharger"/>
- <project name="vendor/broadcom/alsa"/>
<project name="vendor/broadcom/bmoca"/>
- <project name="vendor/broadcom/cfe-bin" path="loader-bin"/>
- <project name="vendor/broadcom/common"/>
- <project name="vendor/broadcom/drivers"/>
<project name="vendor/firmware"/>
<project name="vendor/google/catawampus"/>
- <project name="vendor/google/channel_srv"/>
- <project name="vendor/google/dvbcapture"/>
- <project name="vendor/google/freetypejni"/>
- <project name="vendor/google/frob"/>
- <project name="vendor/google/gips"/>
- <project name="vendor/google/gl_dart"/>
- <project name="vendor/google/glfw_dart"/>
- <project name="vendor/google/imageloadjni"/>
- <project name="vendor/google/jacob100"/>
<project name="vendor/google/jtux"/>
<project name="vendor/google/libgep"/>
<project name="vendor/google/mcastcapture"/>
@@ -56,47 +37,21 @@
<project name="vendor/google/mpegparser"/>
<project name="vendor/google/oregano"/>
<project name="vendor/google/platform"/>
- <project name="vendor/google/prism"/>
- <project name="vendor/google/sagejni"/>
- <project name="vendor/google/sageserver"/>
<project name="vendor/google/sdr"/>
- <project name="vendor/google/spacecast"/>
<project name="vendor/google/swscale"/>
- <project name="vendor/google/tarballs"/>
- <project name="vendor/google/telepresence"/>
<project name="vendor/google/test"/>
- <project name="vendor/google/ts_check"/>
- <project name="vendor/google/tvstreamparser"/>
- <project name="vendor/google/widevine"/>
- <project name="vendor/google/widevine_cenc"/>
- <project name="vendor/humax/bootloader"/>
<project name="vendor/humax/misc"/>
- <project name="vendor/marvell/application"/>
- <project name="vendor/marvell/cpss"/>
- <project name="vendor/marvell/manufacturing"/>
<project name="vendor/mindspeed/drivers" revision="refs/heads/newkernel-4.1"/>
<project name="vendor/mindspeed/drivers" path="vendor/mindspeed/drivers-3.2" revision="refs/heads/master"/>
- <project name="vendor/ookla"/>
<project name="vendor/opensource/backports"/>
- <project name="vendor/opensource/backports" path="vendor/opensource/backports-quantenna" revision="refs/heads/quantenna"/>
<project name="vendor/opensource/bluez"/>
<project name="vendor/opensource/dial"/>
<project name="vendor/opensource/dnsmasq"/>
<project name="vendor/opensource/fallocate"/>
- <project name="vendor/opensource/ffmpeg"/>
- <project name="vendor/opensource/hdhomerun_plugin"/>
<project name="vendor/opensource/hostap"/>
- <project name="vendor/opensource/hostap" path="vendor/opensource/hostapd-quantenna" revision="refs/heads/hostapd-quantenna"/>
- <project name="vendor/opensource/hostap" path="vendor/opensource/wpa_supplicant-quantenna" revision="refs/heads/wpa_supplicant-quantenna"/>
<project name="vendor/opensource/libjingle"/>
- <project name="vendor/opensource/pf_ring"/>
<project name="vendor/opensource/projectM"/>
<project name="vendor/opensource/tarballs"/>
<project name="vendor/opensource/toolbox" path="toolbox-for-linux"/>
<project name="vendor/opensource/webrtc"/>
- <project name="vendor/qualcomm/drivers"/>
- <project name="vendor/qualcomm/switch"/>
- <project name="vendor/quantenna/drivers"/>
- <project name="vendor/sagetv/pullreader"/>
- <project name="vendor/skelmir/vm"/>
</manifest>
