diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-26 21:26:03 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:08 -0400 |
| commit | 1b55d8f34be39ba53f4bf80ebf3ec8d13f46410b (patch) | |
| tree | 0dc993f3eab64d2546d2c460a6dd9b5a4ad9497d /solenv | |
| parent | 6c8c54ee90a2a8d3a8d35b7e89fb39770500936f (diff) | |
add odbc and odbcbase to Library_merged
Change-Id: I9f00d1bcd3b2d285c21eb9f7a4338a1b97d1eca0
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index c416e6cbeb12..d036fb011a23 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -65,6 +65,8 @@ gb_MERGEDLIBS := \ localedata_euro \ localedata_others \ msfilter \ + $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ + $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ oox \ package2 \ sax \ |