summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-10-18 14:20:15 +0100
committerKristian Monsen <kristianm@google.com>2011-10-21 12:40:15 +0100
commit9fb7297dd54aca7ba646ee27608529f33634a7b2 (patch)
tree95467c8be8545d07a24495c2c8a1b644795c7e75
parent4154342345fc67972570f59528233826cd397f1e (diff)
downloadexternal_chromium-9fb7297dd54aca7ba646ee27608529f33634a7b2.zip
external_chromium-9fb7297dd54aca7ba646ee27608529f33634a7b2.tar.gz
external_chromium-9fb7297dd54aca7ba646ee27608529f33634a7b2.tar.bz2
Part of fix for bug 5455901 Fix makefile, turn off exporting everything
Final fix, turn off exporting everything in the makefile, and add needed defines Change-Id: Id0ed1eefa375462a9023ff22ea692631d8477a93
-rw-r--r--Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index add864f..3238c39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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