Merge "Move pseudolocalize to aapt"
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 24d57b2..1d1b6bb 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -101,7 +101,7 @@
-fstack-protector \
-Wa,--noexecstack \
-Werror=format-security \
- -D_FORTIFY_SOURCE=1 \
+ -D_FORTIFY_SOURCE=2 \
-fno-short-enums \
$(arch_variant_cflags)
diff --git a/core/config.mk b/core/config.mk
index 1be3be0..e7ee49f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -322,12 +322,7 @@
FINDBUGS := prebuilt/common/findbugs/bin/findbugs
EMMA_JAR := external/emma/lib/emma$(COMMON_JAVA_PACKAGE_SUFFIX)
-# Deal with archaic version of bison on Mac OS X.
-ifeq ($(filter 1.28,$(shell $(YACC) -V)),)
YACC_HEADER_SUFFIX:= .hpp
-else
-YACC_HEADER_SUFFIX:= .cpp.h
-endif
# Don't use column under Windows, cygwin or not
ifeq ($(HOST_OS),windows)
diff --git a/core/pathmap.mk b/core/pathmap.mk
index 60b5bf7..b76e0ed 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -112,7 +112,10 @@
#
FRAMEWORKS_SUPPORT_SUBDIRS := \
v4 \
- v13 \
+ v7/gridlayout \
+ v7/appcompat \
+ v7/mediarouter \
+ v13
#
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
@@ -120,3 +123,10 @@
#
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS))
+
+#
+# A list of support library modules.
+#
+FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
+ $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir)))
+
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 6325af5..d53d908 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2460,6 +2460,12 @@
margin-left:15px;
}
+dl.xml>dt {
+ text-transform:uppercase;
+}
+dl.xml dl.attr {
+ margin-top:0;
+}
pre.classic {
background-color:transparent;
