Merge "Remove more of the pathmap."
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 38306f4..190aed3 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -39,9 +39,6 @@
frameworks-native:frameworks/native/include \
libhardware:hardware/libhardware/include \
libhardware_legacy:hardware/libhardware_legacy/include \
- libhost:build/libs/host/include \
- libnativehelper:libnativehelper/include \
- libpagemap:system/extras/libpagemap/include \
libril:hardware/ril/include \
opengl-tests-includes:frameworks/native/opengl/tests/include \
recovery:bootable/recovery \
@@ -69,7 +66,7 @@
# Many modules expect to be able to say "#include <jni.h>",
# so make it easy for them to find the correct path.
#
-JNI_H_INCLUDE := $(call include-path-for,libnativehelper)/nativehelper
+JNI_H_INCLUDE := libnativehelper/include/nativehelper
#
# A list of all source roots under frameworks/base, which will be