| commit | b4c0c4b800332fe55c60aa328ece8d849cee3a4d | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Mar 28 16:16:13 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 28 16:16:13 2012 -0700 |
| tree | 1517ed8f1a9a084ee32e5d00c1de2af91bcd49e9 | |
| parent | d8973a71a3d1dd670e5dcdf6e94ec0cd45444eec [diff] | |
| parent | cec40f97a8c0b9a43a78ae98fc35fcc80d6f6c4f [diff] |
Merge "Removed unnecessary include JNI from two drm Android.mk files"
diff --git a/drm/libdrmframework/plugins/common/util/Android.mk b/drm/libdrmframework/plugins/common/util/Android.mk index d096453..81781b2 100644 --- a/drm/libdrmframework/plugins/common/util/Android.mk +++ b/drm/libdrmframework/plugins/common/util/Android.mk
@@ -32,7 +32,6 @@ base := frameworks/av LOCAL_C_INCLUDES += \ - $(JNI_H_INCLUDE) \ $(base)/include \ $(base)/include/drm \ $(base)/include/drm/plugins \
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk index 7c2b622..205b9a5 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
@@ -51,7 +51,6 @@ LOCAL_C_INCLUDES += \ - $(JNI_H_INCLUDE) \ $(base)/include/drm \ $(base)/drm/libdrmframework/plugins/common/include \ $(base)/drm/libdrmframework/plugins/common/util/include \