Merge remote-tracking branch 'aosp/master'

olibc · Nov 27, 2013 · 8d47e19 · 8d47e19
2 parents 7fd3f23 + 54d9cc3
commit 8d47e19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/buildspec.mk.default b/buildspec.mk.default
@@ -88,17 +88,6 @@ ifndef NO_FALLBACK_FONT
 #NO_FALLBACK_FONT:=true
 endif
 
-# To enable instrumentation in webcore based apps like gmail and
-# the browser, define WEBCORE_INSTRUMENTATION:=true
-ifndef WEBCORE_INSTRUMENTATION
-#WEBCORE_INSTRUMENTATION:=true
-endif
-
-# To disable SVG in webcore define ENABLE_SVG:=false
-ifndef ENABLE_SVG
-#ENABLE_SVG:=false
-endif
-
 # OVERRIDE_RUNTIMES allows you to locally override PRODUCT_RUNTIMES.
 #
 # To only build ART, use "runtime_libart_default"

diff --git a/core/main.mk b/core/main.mk
@@ -569,6 +569,10 @@ else # TARGET_BUILD_APPS
     $(BUILT_TARGET_FILES_PACKAGE) \
    )
 
+  # Put a copy of the radio/bootloader files in the dist dir.
+  $(foreach f,$(INSTALLED_RADIOIMAGE_TARGET), \
+    $(call dist-for-goals, droidcore, $(f)))
+
   ifneq ($(TARGET_BUILD_PDK),true)
     $(call dist-for-goals, droidcore, \
       $(APPS_ZIP) \