Merge "Remove WebViewDream from the build." into jb-mr1-dev
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1f6f96d..96577f1 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -93,7 +93,8 @@
-fno-short-enums \
-fstrict-aliasing \
-funswitch-loops \
- -funwind-tables
+ -funwind-tables \
+ -fstack-protector
android_config_h := $(call select-android-config-h,target_linux-x86)
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
diff --git a/core/main.mk b/core/main.mk
index a71359d..87488f4 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -468,6 +468,7 @@
build/tools/acp \
external/gcc-demangle \
external/mksh \
+ external/openssl \
external/yaffs2 \
external/zlib
else # !BUILD_TINY_ANDROID
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index d0b8101..1b80b7f 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2279,7 +2279,7 @@
margin-bottom:0;
}
-blockquote {
+body.about blockquote {
display:block;
float:right;
width:280px;