Reorganize the manifest.xml variants.
Things had evolved "organically" and become kind of a mess. The new setup
has four toplevel manifests to choose from:
openbox.xml: only the bits that are open sourced. (Enough to build an
image.)
no-drm.xml: openbox.xml plus proprietary (but non-drm-related) stuff.
Useful for teams inside the company who don't need access to DRM bits.
drm.xml: no-drm.xml plus DRM stuff (unfortunately including Chrome for
now, since it ends up linking with DRM-restricted bits).
release.xml: drm.xml plus bootloader source code, needed for code signing.
default.xml currently just points at drm.xml. In the public repo, it'll
point to openbox.xml instead.
You can choose a manifest using the -m option to 'repo init' (which it's
safe to re-run even after checking out a repo). For example:
repo init -m release.xml
repo sync -n
We also reorganize the actual packages into public, private, and
drm-restricted include files. Before, drm-restricted was separate, but
public and private were mixed together (we used a separate branch to delete
the 'private' stuff before pushing publically), which was a maintenance
burden. Plus, now it'll be obvious when someone makes a new package: they
have to put it in either public.xml or private.xml, making a conscious
decision.
b/33070819
Change-Id: Ibbba736f5adc06273d0565a22e079a8fc02453a1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4cf8c91
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+.*~
diff --git a/_drm_restricted.xml b/_drm_restricted.xml
new file mode 100644
index 0000000..59da53e
--- /dev/null
+++ b/_drm_restricted.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <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/fiber"/>
+ <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/netflix/nrd"/>
+
+ <project name="vendor/sagetv/miniclient"/>
+</manifest>
diff --git a/_private.xml b/_private.xml
new file mode 100644
index 0000000..301cd88
--- /dev/null
+++ b/_private.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <project name="vendor/broadcom/alsa"/>
+ <project name="vendor/broadcom/bcm851xx_api"/>
+ <project name="vendor/broadcom/cfe-bin" path="loader-bin"/>
+ <project name="vendor/broadcom/common"/>
+ <project name="vendor/broadcom/drivers"/>
+ <project name="vendor/google/channel_srv"/>
+ <project name="vendor/google/dashplayer"/>
+ <project name="vendor/google/dvbcapture"/>
+ <project name="vendor/google/freetypejni"/>
+ <project name="vendor/google/frob"/>
+ <project name="vendor/google/gcm"/>
+ <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/libgep"/>
+ <project name="vendor/google/mcastcapture"/>
+ <project name="vendor/google/mpegparser"/>
+ <project name="vendor/google/oregano"/>
+ <project name="vendor/google/oregano-native"/>
+ <project name="vendor/google/prism"/>
+ <project name="vendor/google/sagejni"/>
+ <project name="vendor/google/sageserver"/>
+ <project name="vendor/google/spacecast"/>
+ <project name="vendor/google/tarballs"/>
+ <project name="vendor/google/telepresence"/>
+ <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/google/wipg"/>
+ <project name="vendor/hfw/glaukus-hal"/>
+ <project name="vendor/hfw/glaukus-linkman"/>
+ <project name="vendor/hfw/glaukus-protobufs"/>
+ <project name="vendor/humax/bootloader"/>
+ <project name="vendor/marvell/3220sdk"/>
+ <project name="vendor/marvell/application"/>
+ <project name="vendor/marvell/cpss"/>
+ <project name="vendor/marvell/dek-tools"/>
+ <project name="vendor/marvell/manufacturing"/>
+ <project name="vendor/ookla"/>
+ <project name="vendor/opensource/backports" path="vendor/opensource/backports-quantenna" revision="refs/heads/quantenna"/>
+ <project name="vendor/opensource/hdhomerun_plugin"/>
+ <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/qualcomm/drivers"/>
+ <project name="vendor/qualcomm/switch"/>
+ <project name="vendor/quantenna/drivers"/>
+ <project name="vendor/sagetv/pullreader"/>
+ <project name="vendor/skelmir/vm"/>
+</manifest>
diff --git a/_public.xml b/_public.xml
new file mode 100644
index 0000000..6aca651
--- /dev/null
+++ b/_public.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <project name="barebox/mindspeed"/>
+ <project name="buildroot"/>
+ <project name="kernel/bruno"/>
+ <project name="kernel/lockdown"/>
+ <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/quantenna"/>
+ <project name="kernel/skids"/>
+ <project name="kernel/windcharger"/>
+ <project name="toolchains/armada"/>
+ <project name="toolchains/bruno"/>
+ <project name="toolchains/bruno_arm"/>
+ <project name="toolchains/kvm"/>
+ <project name="toolchains/mindspeed"/>
+ <project name="toolchains/prism"/>
+ <project name="toolchains/quantenna"/>
+ <project name="toolchains/skids"/>
+ <project name="toolchains/windcharger"/>
+ <project name="uboot/armada"/>
+ <project name="uboot/mindspeed"/>
+ <project name="uboot/prism"/>
+ <project name="uboot/qsr1000"/>
+ <project name="uboot/windcharger"/>
+ <project name="vendor/broadcom/bmoca"/>
+ <project name="vendor/firmware"/>
+ <project name="vendor/google/catawampus"/>
+ <project name="vendor/google/jtux"/>
+ <project name="vendor/google/minijail"/>
+ <project name="vendor/google/platform"/>
+ <project name="vendor/google/sdr"/>
+ <project name="vendor/google/swscale"/>
+ <project name="vendor/google/test"/>
+ <project name="vendor/humax/misc"/>
+ <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/opensource/backports"/>
+ <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/hostap"/>
+ <project name="vendor/opensource/libjingle"/>
+ <project name="vendor/opensource/netsnmp"/>
+ <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/tornado"/>
+ <project name="vendor/opensource/webrtc"/>
+</manifest>
diff --git a/_url.xml b/_url.xml
new file mode 100644
index 0000000..c85c631
--- /dev/null
+++ b/_url.xml
@@ -0,0 +1,11 @@
+<?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"/>
+</manifest>
diff --git a/default.xml b/default.xml
index 8d666bf..d59a3a7 100644
--- a/default.xml
+++ b/default.xml
@@ -1,74 +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/fiber"/>
- <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/netflix/nrd"/>
-
- <project name="vendor/sagetv/miniclient"/>
+ <include name="drm.xml"/>
</manifest>
diff --git a/default_unrestricted.xml b/default_unrestricted.xml
deleted file mode 100644
index e4d99df..0000000
--- a/default_unrestricted.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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"/>
- <manifest-server
- url="http://gfiber-buildbot.cbf.corp.google.com:8080/"/>
-
- <project name="barebox/mindspeed"/>
- <project name="buildroot"/>
- <project name="kernel/bruno"/>
- <project name="kernel/lockdown"/>
- <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/quantenna"/>
- <project name="kernel/skids"/>
- <project name="kernel/windcharger"/>
- <project name="toolchains/armada"/>
- <project name="toolchains/bruno"/>
- <project name="toolchains/bruno_arm"/>
- <project name="toolchains/kvm"/>
- <project name="toolchains/mindspeed"/>
- <project name="toolchains/prism"/>
- <project name="toolchains/quantenna"/>
- <project name="toolchains/skids"/>
- <project name="toolchains/windcharger"/>
- <project name="uboot/armada"/>
- <project name="uboot/mindspeed"/>
- <project name="uboot/prism"/>
- <project name="uboot/qsr1000"/>
- <project name="uboot/windcharger"/>
- <project name="vendor/broadcom/alsa"/>
- <project name="vendor/broadcom/bcm851xx_api"/>
- <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/dashplayer"/>
- <project name="vendor/google/dvbcapture"/>
- <project name="vendor/google/freetypejni"/>
- <project name="vendor/google/frob"/>
- <project name="vendor/google/gcm"/>
- <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"/>
- <project name="vendor/google/minijail"/>
- <project name="vendor/google/mpegparser"/>
- <project name="vendor/google/oregano"/>
- <project name="vendor/google/oregano-native"/>
- <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/google/wipg"/>
- <project name="vendor/hfw/glaukus-hal"/>
- <project name="vendor/hfw/glaukus-linkman"/>
- <project name="vendor/hfw/glaukus-protobufs"/>
- <project name="vendor/humax/bootloader"/>
- <project name="vendor/humax/misc"/>
- <project name="vendor/marvell/3220sdk"/>
- <project name="vendor/marvell/application"/>
- <project name="vendor/marvell/cpss"/>
- <project name="vendor/marvell/dek-tools"/>
- <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/netsnmp"/>
- <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/tornado"/>
- <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>
diff --git a/drm.xml b/drm.xml
new file mode 100644
index 0000000..38c6f55
--- /dev/null
+++ b/drm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <include name="_url.xml"/>
+ <include name="_public.xml"/>
+ <include name="_private.xml"/>
+ <include name="_drm_restricted.xml"/>
+</manifest>
diff --git a/no-drm.xml b/no-drm.xml
new file mode 100644
index 0000000..abf8610
--- /dev/null
+++ b/no-drm.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <include name="_url.xml"/>
+ <include name="_public.xml"/>
+ <include name="_private.xml"/>
+</manifest>
diff --git a/openbox.xml b/openbox.xml
new file mode 100644
index 0000000..a78da64
--- /dev/null
+++ b/openbox.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <include name="_url.xml"/>
+ <include name="_public.xml"/>
+</manifest>
diff --git a/release.xml b/release.xml
index 989eb98..acc6b50 100644
--- a/release.xml
+++ b/release.xml
@@ -1,15 +1,9 @@
<?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.xml"/>
+ <include name="_url.xml"/>
+ <include name="_public.xml"/>
+ <include name="_private.xml"/>
+ <include name="_drm_restricted.xml"/>
<project name="vendor/broadcom/bolt"/>
<project name="vendor/broadcom/cfe"/>
