diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-10-24 03:05:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-24 03:05:09 -0700 |
| commit | c3316eaa89943a2f6a8c51c831807b5e42d6d99b (patch) | |
| tree | 95467c8be8545d07a24495c2c8a1b644795c7e75 | |
| parent | e1ab1f63a849e42fb3d11ca671030b83897b96d3 (diff) | |
| parent | 9fb7297dd54aca7ba646ee27608529f33634a7b2 (diff) | |
| download | external_chromium-c3316eaa89943a2f6a8c51c831807b5e42d6d99b.zip external_chromium-c3316eaa89943a2f6a8c51c831807b5e42d6d99b.tar.gz external_chromium-c3316eaa89943a2f6a8c51c831807b5e42d6d99b.tar.bz2 | |
am 9fb7297d: Part of fix for bug 5455901 Fix makefile, turn off exporting everything
* commit '9fb7297dd54aca7ba646ee27608529f33634a7b2':
Part of fix for bug 5455901 Fix makefile, turn off exporting everything
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -465,8 +465,8 @@ $(GEN): perl $(SCRIPT) $@ "public/WebString.h" LOCAL_GENERATED_SOURCES += $(GEN) -LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DEXPAT_RELATIVE_PATH -DALLOW_QUOTED_COOKIE_VALUES -LOCAL_CPPFLAGS := -Wno-sign-promo -Wno-missing-field-initializers +LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DEXPAT_RELATIVE_PATH -DALLOW_QUOTED_COOKIE_VALUES -DCOMPONENT_BUILD -DGURL_DLL +LOCAL_CPPFLAGS := -Wno-sign-promo -Wno-missing-field-initializers -fvisibility=hidden -fvisibility-inlines-hidden # Just a few definitions not provided by bionic. LOCAL_CFLAGS += -include "android/prefix.h" @@ -478,7 +478,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_C_INCLUDES) LOCAL_WHOLE_STATIC_LIBRARIES += libevent modp_b64 dmg_fp libcutils -LOCAL_SHARED_LIBRARIES = libstlport libexpat libcrypto libssl libz libicuuc libicui18n libsqlite libcutils libdl +LOCAL_SHARED_LIBRARIES := libstlport libexpat libcrypto libssl libz libicuuc libicui18n libsqlite libcutils libdl LOCAL_PRELINK_MODULE := false |