Merge "Remove Camera package (it's merged into Gallery package)."
diff --git a/core/config.mk b/core/config.mk
index 8c9749e..b42e7dc 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -29,6 +29,8 @@
$(TOPDIR)hardware/libhardware_legacy/include \
$(TOPDIR)hardware/ril/include \
$(TOPDIR)dalvik/libnativehelper/include \
+ $(TOPDIR)frameworks/native/include \
+ $(TOPDIR)frameworks/native/opengl/include \
$(TOPDIR)frameworks/base/include \
$(TOPDIR)frameworks/base/opengl/include \
$(TOPDIR)frameworks/base/native/include \
diff --git a/core/pathmap.mk b/core/pathmap.mk
index c3d7c69..041a7b0 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -34,6 +34,7 @@
corecg:external/skia/include/core \
dbus:external/dbus \
frameworks-base:frameworks/base/include \
+ frameworks-native:frameworks/native/include \
graphics:external/skia/include/core \
libc:bionic/libc/include \
libdrm1:frameworks/base/media/libdrm/mobile1/include \
@@ -47,7 +48,7 @@
libstdc++:bionic/libstdc++/include \
libthread_db:bionic/libthread_db/include \
mkbootimg:system/core/mkbootimg \
- opengl-tests-includes:frameworks/base/opengl/tests/include \
+ opengl-tests-includes:frameworks/native/opengl/tests/include \
recovery:bootable/recovery \
system-core:system/core/include \
speex:external/speex/include