summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--staging-galaxynexus.xml46
1 files changed, 23 insertions, 23 deletions
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 1da57d0..5482b0b 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -129,7 +129,7 @@
<project path="external/v8" name="platform/external/v8" revision="linaro_android_4.2" />
<!-- Linaro modifications: need to be restored -->
<project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" revision="refs/tags/android-4.2_r1" />
- <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" />
+ <project path="frameworks/compile/llvm-ndk-cc" name="platform/frameworks/compile/llvm-ndk-cc" remote="aosp-upstream" />
<!-- Linaro modifications: Made it build with OpenJDK -->
<project path="external/guava" name="platform/external/guava" revision="linaro_android_4.2" />
<!-- Linaro modifications: Set CPU specific compiler flags, init.partitions.rc -->
@@ -152,14 +152,14 @@
<project path="bootable/recovery" name="platform/bootable/recovery" />
<project path="development" name="platform/development" />
<project path="device/asus/grouper" name="device/asus/grouper" groups="device" />
- <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device" />
+ <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device" remote="aosp-upstream" />
<project path="device/common" name="device/common" />
<project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
<project path="device/generic/armv7-a" name="device/generic/armv7-a" />
- <project path="device/generic/common" name="device/generic/common" />
+ <project path="device/generic/common" name="device/generic/common" remote="aosp-upstream" />
<project path="device/generic/goldfish" name="device/generic/goldfish" />
- <project path="device/generic/mips" name="device/generic/mips" />
- <project path="device/generic/x86" name="device/generic/x86" />
+ <project path="device/generic/mips" name="device/generic/mips" remote="aosp-upstream" />
+ <project path="device/generic/x86" name="device/generic/x86" remote="aosp-upstream" />
<project path="device/google/accessory/arduino" name="device/google/accessory/arduino" groups="device" />
<project path="device/google/accessory/demokit" name="device/google/accessory/demokit" groups="device" />
<project path="device/sample" name="device/sample" />
@@ -178,7 +178,7 @@
<project path="external/astl" name="platform/external/astl" />
<project path="external/bison" name="platform/external/bison" />
<project path="external/blktrace" name="platform/external/blktrace" />
- <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" />
+ <project path="external/bluetooth/bluedroid" name="platform/external/bluetooth/bluedroid" remote="aosp-upstream" />
<project path="external/bouncycastle" name="platform/external/bouncycastle" />
<project path="external/bsdiff" name="platform/external/bsdiff" />
<project path="external/bzip2" name="platform/external/bzip2" />
@@ -227,24 +227,24 @@
<project path="external/jsr305" name="platform/external/jsr305" />
<project path="external/junit" name="platform/external/junit" />
<project path="external/kernel-headers" name="platform/external/kernel-headers" />
- <project path="external/libcap-ng" name="platform/external/libcap-ng" />
+ <project path="external/libcap-ng" name="platform/external/libcap-ng" remote="aosp-upstream" />
<project path="external/libffi" name="platform/external/libffi" />
<project path="external/libgsm" name="platform/external/libgsm" />
<project path="external/liblzf" name="platform/external/liblzf" />
<project path="external/libmtp" name="platform/external/libmtp" />
- <project path="external/libnfc-nci" name="platform/external/libnfc-nci" />
+ <project path="external/libnfc-nci" name="platform/external/libnfc-nci" remote="aosp-upstream" />
<project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
<project path="external/libnl-headers" name="platform/external/libnl-headers" />
- <project path="external/libogg" name="platform/external/libogg" />
+ <project path="external/libogg" name="platform/external/libogg" remote="aosp-upstream" />
<project path="external/libpcap" name="platform/external/libpcap" />
<project path="external/libphonenumber" name="platform/external/libphonenumber" />
<project path="external/libpng" name="platform/external/libpng" />
- <project path="external/libppp" name="platform/external/libppp" />
+ <project path="external/libppp" name="platform/external/libppp" remote="aosp-upstream" />
<project path="external/libselinux" name="platform/external/libselinux" />
<project path="external/libsepol" name="platform/external/libsepol" />
<project path="external/libusb" name="platform/external/libusb" />
<project path="external/libusb-compat" name="platform/external/libusb-compat" />
- <project path="external/libvorbis" name="platform/external/libvorbis" />
+ <project path="external/libvorbis" name="platform/external/libvorbis" remote="aosp-upstream" />
<project path="external/libvpx" name="platform/external/libvpx" />
<project path="external/libxml2" name="platform/external/libxml2" />
<project path="external/libxslt" name="platform/external/libxslt" />
@@ -256,7 +256,7 @@
<project path="external/mdnsresponder" name="platform/external/mdnsresponder" />
<project path="external/mksh" name="platform/external/mksh" />
<project path="external/mockwebserver" name="platform/external/mockwebserver" />
- <project path="external/mp4parser" name="platform/external/mp4parser" />
+ <project path="external/mp4parser" name="platform/external/mp4parser" remote="aosp-upstream" />
<project path="external/mtpd" name="platform/external/mtpd" />
<project path="external/naver-fonts" name="platform/external/naver-fonts" />
<project path="external/netcat" name="platform/external/netcat" />
@@ -285,13 +285,13 @@
<project path="external/tagsoup" name="platform/external/tagsoup" />
<project path="external/tinyalsa" name="platform/external/tinyalsa" />
<project path="external/tinyxml" name="platform/external/tinyxml" />
- <project path="external/tinyxml2" name="platform/external/tinyxml2" />
+ <project path="external/tinyxml2" name="platform/external/tinyxml2" remote="aosp-upstream" />
<project path="external/valgrind" name="platform/external/valgrind" />
<project path="external/webp" name="platform/external/webp" />
<project path="external/webrtc" name="platform/external/webrtc" />
<project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" />
<project path="external/xmlwriter" name="platform/external/xmlwriter" />
- <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" />
+ <project path="external/xmp_toolkit" name="platform/external/xmp_toolkit" remote="aosp-upstream" />
<project path="external/yaffs2" name="platform/external/yaffs2" />
<project path="external/zlib" name="platform/external/zlib" />
<project path="external/zxing" name="platform/external/zxing" />
@@ -304,7 +304,7 @@
<project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" />
<project path="frameworks/opt/mailcommon" name="platform/frameworks/opt/mailcommon" />
<project path="frameworks/opt/mms" name="platform/frameworks/opt/mms" />
- <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" />
+ <project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" remote="aosp-upstream" />
<project path="frameworks/opt/telephony" name="platform/frameworks/opt/telephony" />
<project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" />
<project path="frameworks/support" name="platform/frameworks/support" />
@@ -312,7 +312,7 @@
<project path="gdk" name="platform/gdk" />
<project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" />
<project path="hardware/invensense" name="platform/hardware/invensense" />
- <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" />
+ <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" remote="aosp-upstream" />
<project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
<project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
<project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
@@ -362,9 +362,9 @@
<project path="packages/providers/PartnerBookmarksProvider" name="platform/packages/providers/PartnerBookmarksProvider" />
<project path="packages/providers/TelephonyProvider" name="platform/packages/providers/TelephonyProvider" />
<project path="packages/providers/UserDictionaryProvider" name="platform/packages/providers/UserDictionaryProvider" />
- <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" />
- <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" />
- <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" />
+ <project path="packages/screensavers/Basic" name="platform/packages/screensavers/Basic" remote="aosp-upstream" />
+ <project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" remote="aosp-upstream" />
+ <project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" remote="aosp-upstream" />
<project path="packages/wallpapers/Basic" name="platform/packages/wallpapers/Basic" />
<project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" />
<project path="packages/wallpapers/HoloSpiral" name="platform/packages/wallpapers/HoloSpiral" />
@@ -374,10 +374,10 @@
<project path="packages/wallpapers/NoiseField" name="platform/packages/wallpapers/NoiseField" />
<project path="packages/wallpapers/PhaseBeam" name="platform/packages/wallpapers/PhaseBeam" />
<project path="pdk" name="platform/pdk" />
- <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin" />
- <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin" />
- <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux" />
- <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux" />
+ <project path="prebuilts/clang/darwin-x86/3.1" name="platform/prebuilts/clang/darwin-x86/3.1" groups="darwin" remote="aosp-upstream" />
+ <project path="prebuilts/clang/darwin-x86/3.2" name="platform/prebuilts/clang/darwin-x86/3.2" groups="darwin" remote="aosp-upstream" />
+ <project path="prebuilts/clang/linux-x86/3.1" name="platform/prebuilts/clang/linux-x86/3.1" groups="linux" remote="aosp-upstream" />
+ <project path="prebuilts/clang/linux-x86/3.2" name="platform/prebuilts/clang/linux-x86/3.2" groups="linux" remote="aosp-upstream" />
<project path="prebuilts/eclipse" name="platform/prebuilts/eclipse" />
<project path="prebuilts/eclipse-build-deps" name="platform/prebuilts/eclipse-build-deps" groups="notdefault,eclipse" />
<project path="prebuilts/eclipse-build-deps-sources" name="platform/prebuilts/eclipse-build-deps-sources" groups="notdefault,eclipse" />