diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-20 13:37:19 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-07-20 13:37:19 -0700 |
| commit | 240677ec68790b9af5fd16a604c0780eb2938bd6 (patch) | |
| tree | 6ab427a0f6f36a3687c2ca720130a6bc12c2739b /media/libeffects | |
| parent | eaeffac5fc8244d8fe03de786baa3ca76f5553b8 (diff) | |
| parent | dd2060932a7472ce361faacd340b0ef05b14c6ef (diff) | |
| download | frameworks_base-240677ec68790b9af5fd16a604c0780eb2938bd6.zip frameworks_base-240677ec68790b9af5fd16a604c0780eb2938bd6.tar.gz frameworks_base-240677ec68790b9af5fd16a604c0780eb2938bd6.tar.bz2 | |
resolved conflicts for merge of dd206093 to master
Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae
Diffstat (limited to 'media/libeffects')
| -rw-r--r-- | media/libeffects/factory/EffectsFactory.c | 2 | ||||
| -rw-r--r-- | media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libeffects/factory/EffectsFactory.c b/media/libeffects/factory/EffectsFactory.c index edd6184..0be280c 100644 --- a/media/libeffects/factory/EffectsFactory.c +++ b/media/libeffects/factory/EffectsFactory.c @@ -31,7 +31,7 @@ static list_elem_t *gCurLib; // current library in enumeration process static list_elem_t *gCurEffect; // current effect in enumeration process static uint32_t gCurEffectIdx; // current effect index in enumeration process -static const char * const gEffectLibPath = "/system/lib/soundfx"; // path to built-in effect libraries +const char * const gEffectLibPath = "/system/lib/soundfx"; // path to built-in effect libraries static int gInitDone; // true is global initialization has been preformed static int gNextLibId; // used by loadLibrary() to allocate unique library handles static int gCanQueryEffect; // indicates that call to EffectQueryEffect() is valid, i.e. that the list of effects diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index 3bbcf55..9e39e79 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "Bundle" #define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) #define LVM_BUNDLE // Include all the bundle code -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #include <cutils/log.h> #include <assert.h> |