Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index a36d4f9..d182dc0 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -29,6 +29,10 @@
ifeq (eng,$(TARGET_BUILD_VARIANT))
WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true
endif
+# Add mini-debug-info to the boot classpath unless explicitly asked not to.
+ ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))
+ PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info
+ endif
endif
GLOBAL_DEXPREOPT_FLAGS :=
diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs
index 52674ba..7cf078a 100644
--- a/tools/droiddoc/templates-sdk-dev/head_tag.cs
+++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs
@@ -83,6 +83,8 @@
elif:(about||versions||wear||tv||auto) ?>/about<?cs
elif:preview ?>/preview<?cs
elif:design ?>/design<?cs
+ elif:reference.testSupport ?>/reference/android/support/test<?cs
+ elif:reference.wearableSupport ?>/reference/android/support/wearable<?cs
elif:walkthru ?>/walkthru<?cs /if ?><?cs
/if ?>/_book.yaml" />
<?cs /if ?>