diff options
| author | 2016-09-16 08:56:41 +0000 | |
|---|---|---|
| committer | 2016-09-16 08:56:41 +0000 | |
| commit | c65df378c1d0aa1b42b136a26b56fe0ade2f99bc (patch) | |
| tree | 24f0fe9fb15a28502dc3b3f56cafa597b26ebcac | |
| parent | 2ef54a4f2b5e957c5767f44e826fe100ec9eec19 (diff) | |
| parent | 924288c24d1240ed5e87f5586d07b283a09b9b06 (diff) | |
Merge "Stop including libcore/include/ in most of frameworks/base." am: 05884ac869 am: 21ba3d9527
am: 924288c24d
Change-Id: I40f8a8ab3532ae3dbf8324c116e2e1226ab26780
| -rw-r--r-- | drm/jni/Android.mk | 1 | ||||
| -rw-r--r-- | services/core/jni/Android.mk | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drm/jni/Android.mk b/drm/jni/Android.mk index 08c7b953b813..d0797a9849cd 100644 --- a/drm/jni/Android.mk +++ b/drm/jni/Android.mk @@ -37,7 +37,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/drm/libdrmframework/include \ $(TOP)/frameworks/av/drm/libdrmframework/plugins/common/include \ $(TOP)/frameworks/av/include \ - $(TOP)/libcore/include LOCAL_MODULE_TAGS := optional diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk index a502c3ac7b1a..ac55a7eec21c 100644 --- a/services/core/jni/Android.mk +++ b/services/core/jni/Android.mk @@ -45,8 +45,6 @@ LOCAL_C_INCLUDES += \ frameworks/base/libs/hwui \ frameworks/base/core/jni \ frameworks/native/services \ - libcore/include \ - libcore/include/libsuspend \ system/security/keystore/include \ $(call include-path-for, libhardware)/hardware \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ |