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
diff --git a/Android.mk b/Android.mk
index add864f..3238c39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -465,8 +465,8 @@
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_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
