summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deymo <deymo@google.com>2016-08-24 14:57:20 -0700
committerAlex Deymo <deymo@google.com>2016-08-24 16:25:25 -0700
commit6ea6043247a5c086ce799e02ec4a9e10c8ab4ddd (patch)
treea97e852ff4524b1e65531a966e745fa7e64924cf
parent61811c47733b2419cffa22712683111f718a325b (diff)
downloadmanifest-6ea6043247a5c086ce799e02ec4a9e10c8ab4ddd.tar.gz
Update Brillo manifest to N changes.
This patch reflects the changes in the main Android manifest, tailored to Brillo. cameraservice uses the new external/libjpeg-turbo repo instead of external/jpeg. frameworks/wilhelm not used anymore. Bug: 31068444 TEST=`repo sync; make dist` Change-Id: I4e0ae6e7dedb7d1c5cbd04307e71aac3969ed921
-rw-r--r--default.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/default.xml b/default.xml
index 771f97e..b2477d4 100644
--- a/default.xml
+++ b/default.xml
@@ -59,7 +59,6 @@
<project path="external/curl" name="platform/external/curl" groups="bdk" />
<project path="external/dbus" name="platform/external/dbus" groups="bdk" />
<project path="external/dbus-binding-generator" name="platform/external/dbus-binding-generator" groups="bdk" />
- <project path="external/dhcpcd" name="platform/external/dhcpcd" groups="bdk" />
<project path="external/dhcpcd-6.8.2" name="platform/external/dhcpcd-6.8.2" groups="bdk" />
<project path="external/dnsmasq" name="platform/external/dnsmasq" groups="bdk" />
<project path="external/e2fsprogs" name="platform/external/e2fsprogs" groups="bdk" />
@@ -79,7 +78,6 @@
<project path="external/iputils" name="platform/external/iputils" groups="bdk" />
<project path="external/iw" name="platform/external/iw" groups="bdk" />
<project path="external/jemalloc" name="platform/external/jemalloc" groups="bdk" />
- <project path="external/jpeg" name="platform/external/jpeg" groups="bdk" />
<project path="external/libbrillo" name="platform/external/libbrillo" groups="bdk" />
<project path="external/libcap" name="platform/external/libcap" groups="bdk" />
<project path="external/libcap-ng" name="platform/external/libcap-ng" groups="bdk" />
@@ -91,6 +89,7 @@
<project path="external/libdaemon" name="platform/external/libdaemon" groups="bdk" />
<project path="external/libevent" name="platform/external/libevent" groups="bdk" />
<project path="external/libgsm" name="platform/external/libgsm" groups="bdk" />
+ <project path="external/libjpeg-turbo" name="platform/external/libjpeg-turbo" groups="bdk" />
<project path="external/liblzf" name="platform/external/liblzf" groups="bdk" />
<project path="external/libmicrohttpd" name="platform/external/libmicrohttpd" groups="bdk" />
<project path="external/libnl" name="platform/external/libnl" groups="bdk" />
@@ -132,7 +131,6 @@
<project path="external/xmlrpcpp" name="platform/external/xmlrpcpp" groups="bdk" />
<project path="external/zlib" name="platform/external/zlib" groups="bdk" />
<project path="frameworks/av" name="platform/frameworks/av" groups="bdk" />
- <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" groups="bdk" />
<project path="frameworks/compile/libbcc" name="platform/frameworks/compile/libbcc" groups="bdk" />
<project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" groups="bdk" />
<project path="frameworks/native" name="platform/frameworks/native" groups="bdk" />