diff options
| -rw-r--r-- | default.xml | 4 | ||||
| -rw-r--r-- | staging-panda.xml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/default.xml b/default.xml index 0b8137f..de48cd5 100644 --- a/default.xml +++ b/default.xml @@ -63,10 +63,12 @@ <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Use better IOCTL for updating display, fix inverted colors on BRGA, Add audio workaround for Angrybirds, allow overriding framebuffer device, add Samsung OMX specific macros --> <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_4.1.1" /> + <!-- Linaro modifications: Make sure we can find omapfb.h --> + <!-- FIXME The 4.0.4 branch contains further changes that may need merging --> + <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: need porting --> <project path="system/core" name="platform/system/core" revision="refs/tags/android-4.1.1_r1" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="refs/tags/android-4.1.1_r1" /> - <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="refs/tags/android-4.1.1_r1" /> <project path="system/vold" name="platform/system/vold" revision="refs/tags/android-4.1.1_r1"/> <!-- Linaro modifications: Fixed aliasing violations, improved sincos(), improved string handling functions, added new kernel headers --> <project path="bionic" name="platform/bionic" revision="linaro_android_4.1.1" /> diff --git a/staging-panda.xml b/staging-panda.xml index d3edaad..fa773d7 100644 --- a/staging-panda.xml +++ b/staging-panda.xml @@ -85,11 +85,12 @@ <project path="external/guava" name="platform/external/guava" revision="linaro_android_4.1.1" /> <!-- Linaro modifications: Set CPU specific compiler flags --> <project path="device/samsung/tuna" name="device/samsung/tuna" revision="linaro_android_4.1.1" /> - *** + <!-- Linaro modifications: Find omapfb.h --> + <!-- FIXME The 4.0.4 branch has further changes that may need porting --> + <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.1.1" /> <!-- Has Linaro modifications on 4.0.4 that may need porting --> <project path="system/core" name="platform/system/core" /> <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" /> - <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" /> <project path="system/vold" name="platform/system/vold" /> <project path="external/srec" name="platform/external/srec" /> <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" /> @@ -122,7 +123,6 @@ <project path="frameworks/compile/linkloader" name="platform/frameworks/compile/linkloader" /> <project path="external/libvpx" name="platform/external/libvpx" /> <project path="external/gtest" name="platform/external/gtest" /> - *** <project name="people/afrantzis/glmark2" path="packages/apps/glmark2" remote="linaro-other" revision="master"/> <!-- TI proprietary-open --> |