diff options
author | Gloria Wang <gwang@google.com> | 2011-08-04 15:13:14 -0700 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2011-08-04 15:13:14 -0700 |
commit | cfff1f2b0bac432fac49f0b21e09e08f0e913622 (patch) | |
tree | dbcae16e000420b1a7bf15e48d6c088c1c0bab24 /drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk | |
parent | 6801b4dbd00b485ecdcd31b517ed885a8fa21c63 (diff) | |
parent | e3c56d16412882e2dac697fbe6fa9852ee4dee31 (diff) | |
download | frameworks_av-cfff1f2b0bac432fac49f0b21e09e08f0e913622.zip frameworks_av-cfff1f2b0bac432fac49f0b21e09e08f0e913622.tar.gz frameworks_av-cfff1f2b0bac432fac49f0b21e09e08f0e913622.tar.bz2 |
resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
Diffstat (limited to 'drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk')
-rw-r--r-- | drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk index 9805a40..e359dbd 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk @@ -17,6 +17,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +# The flag below turns on local debug printouts +#LOCAL_CFLAGS += -DDRM_OMA_FL_ENGINE_DEBUG + base := frameworks/base # Determine whether the DRM framework uses 64-bit data types for file offsets and do the same. |