am b101f73b: am 43bbbf8a: Merge "Remove more of the pathmap."

* commit 'b101f73be95aade6719d1d92c8afbb3df8a0d4c9':
  Remove more of the pathmap.
This commit is contained in:
Elliott Hughes 2015-09-24 22:05:42 +00:00 committed by Android Git Automerger
commit 4f74c05f88

View file

@ -39,9 +39,6 @@ pathmap_INCL := \
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 \
@ -70,7 +67,7 @@ endef
# 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