Merge "Add framework/native to fix build."
diff --git a/ide/eclipse/android-include-paths.xml b/ide/eclipse/android-include-paths.xml
index 2d6f229..bb038a2 100644
--- a/ide/eclipse/android-include-paths.xml
+++ b/ide/eclipse/android-include-paths.xml
@@ -22,8 +22,9 @@
<includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
<includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
<includepath>${ProjDirPath}/hardware/ril/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
<includepath>${ProjDirPath}/frameworks/base/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/opengl/include</includepath>
<includepath>${ProjDirPath}/frameworks/base/native/include</includepath>
<includepath>${ProjDirPath}/external/skia/include</includepath>
<includepath>${ProjDirPath}/external/skia/include/core</includepath>
@@ -47,8 +48,9 @@
<includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
<includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
<includepath>${ProjDirPath}/hardware/ril/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
<includepath>${ProjDirPath}/frameworks/base/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/opengl/include</includepath>
<includepath>${ProjDirPath}/frameworks/base/native/include</includepath>
<includepath>${ProjDirPath}/external/skia/include</includepath>
<includepath>${ProjDirPath}/external/skia/include/core</includepath>
@@ -72,8 +74,9 @@
<includepath>${ProjDirPath}/hardware/libhardware/include</includepath>
<includepath>${ProjDirPath}/hardware/libhardware_legacy/include</includepath>
<includepath>${ProjDirPath}/hardware/ril/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/include</includepath>
+<includepath>${ProjDirPath}/frameworks/native/opengl/include</includepath>
<includepath>${ProjDirPath}/frameworks/base/include</includepath>
-<includepath>${ProjDirPath}/frameworks/base/opengl/include</includepath>
<includepath>${ProjDirPath}/frameworks/base/native/include</includepath>
<includepath>${ProjDirPath}/external/skia/include</includepath>
<includepath>${ProjDirPath}/external/skia/include/core</includepath>
diff --git a/samples/BrowserPlugin/jni/RenderingThread.h b/samples/BrowserPlugin/jni/RenderingThread.h
index cb4fb96..6136019 100644
--- a/samples/BrowserPlugin/jni/RenderingThread.h
+++ b/samples/BrowserPlugin/jni/RenderingThread.h
@@ -26,6 +26,7 @@
#include "SkCanvas.h"
#include "SkBitmap.h"
+#include <utils/threads.h>
#include <EGL/egl.h>
#include <GLES2/gl2.h>
diff --git a/samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml b/samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml
new file mode 100644
index 0000000..9a4dc8c
--- /dev/null
+++ b/samples/training/multiscreen/newsreader/res/values-large-land/layouts.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- BEGIN_INCLUDE(all) -->
+<resources>
+ <item name="main_layout" type="layout">@layout/twopanes</item>
+ <bool name="has_two_panes">true</bool>
+</resources>
+<!-- END_INCLUDE(all) -->
diff --git a/samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml b/samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml
new file mode 100644
index 0000000..39c4645
--- /dev/null
+++ b/samples/training/multiscreen/newsreader/res/values-large-port/layouts.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- BEGIN_INCLUDE(all) -->
+<resources>
+ <item name="main_layout" type="layout">@layout/twopanes_narrow</item>
+ <bool name="has_two_panes">true</bool>
+</resources>
+<!-- END_INCLUDE(all) -->
diff --git a/tools/elftree/Android.mk b/tools/elftree/Android.mk
index 0bba0f2..c2199aa 100644
--- a/tools/elftree/Android.mk
+++ b/tools/elftree/Android.mk
@@ -14,6 +14,10 @@
LOCAL_PATH := $(call my-dir)
+supported_platforms := linux-x86 darwin-x86
+cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
+
+ifdef cur_platform
# Target executable
# TODO: Requires libelf for target
@@ -35,5 +39,10 @@
LOCAL_MODULE := elftree
LOCAL_SRC_FILES := elftree.c
LOCAL_C_INCLUDES := external/elfutils/libelf
+# to fix compatibility issues in elf headers across different platforms
+LOCAL_CFLAGS += \
+ -include external/elfutils/host-$(HOST_OS)-fixup/AndroidFixup.h
LOCAL_STATIC_LIBRARIES := libelf
include $(BUILD_HOST_EXECUTABLE)
+
+endif #cur_platform
diff --git a/tools/emulator/system/camera/JpegCompressor.h b/tools/emulator/system/camera/JpegCompressor.h
index 1f97ae4..504ffcd 100644
--- a/tools/emulator/system/camera/JpegCompressor.h
+++ b/tools/emulator/system/camera/JpegCompressor.h
@@ -23,6 +23,7 @@
*/
#include <YuvToJpegEncoder.h>
+#include <utils/threads.h>
namespace android {
diff --git a/tools/etc1tool/Android.mk b/tools/etc1tool/Android.mk
index a66af25..c51d47c 100644
--- a/tools/etc1tool/Android.mk
+++ b/tools/etc1tool/Android.mk
@@ -17,8 +17,6 @@
#LOCAL_WHOLE_STATIC_LIBRARIES :=
LOCAL_STATIC_LIBRARIES := \
libhost \
- libutils \
- libcutils \
libexpat \
libpng \
libETC1