Merge "sdk.atree does not need DIST_DIR any longer."
diff --git a/target/board/Android.mk b/target/board/Android.mk
index 82dee3c..54ee9e7 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -20,9 +20,6 @@
INSTALLED_KERNEL_TARGET :=
endif
-# Use the add-radio-file function to add values to this variable.
-INSTALLED_RADIOIMAGE_TARGET :=
-
-include $(TARGET_DEVICE_DIR)/AndroidBoard.mk
# Generate a file that contains various information about the
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 9ad45a9..19f94ee 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -25,7 +25,8 @@
VoiceDialer \
libWnnEngDic \
libWnnJpnDic \
- libwnndict
+ libwnndict \
+ WAPPushManager
# Additional settings used in all AOSP builds
PRODUCT_PROPERTY_OVERRIDES := \
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 893cb45..c2b0056 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -202,18 +202,6 @@
cmd = "".join(cmd)
self.script.append(self._WordWrap(cmd))
- def WriteFirmwareImage(self, kind, fn):
- """Arrange to update the given firmware image (kind must be
- "hboot" or "radio") when recovery finishes."""
- if self.version == 1:
- self.script.append(
- ('assert(package_extract_file("%(fn)s", "/tmp/%(kind)s.img"),\n'
- ' write_firmware_image("/tmp/%(kind)s.img", "%(kind)s"));')
- % {'kind': kind, 'fn': fn})
- else:
- self.script.append(
- 'write_firmware_image("PACKAGE:%s", "%s");' % (fn, kind))
-
def WriteRawImage(self, mount_point, fn):
"""Write the given package file into the partition for the given
mount point."""