commit 1747c60790b3e40b0322a80cbd7de30bb9e28ecd
author Nick Kralevich <nnk@google.com> Mon Apr 09 12:30:12 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 12:30:12 2012 -0700
tree a51c45495b4757430278eee52acb3959b1d5a336
parent 28514d1b2b5a1675e5402bf138fa8cd62c1b0471
parent 020e4919e89a824783dbe8716bc56785267323f7

Merge "ARM: compile everything with relro / bind_now."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 11a897a..07064e0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -443,7 +443,8 @@
 define combine-notice-files
 $(1) $(2): PRIVATE_MESSAGE := $(3)
 $(1) $(2): PRIVATE_DIR := $(4)
-$(1) $(2): $(5) $(BUILD_SYSTEM)/Makefile build/tools/generate-notice-files.py
+$(1) : $(2)
+$(2) : $(5) $(BUILD_SYSTEM)/Makefile build/tools/generate-notice-files.py
 	build/tools/generate-notice-files.py $(1) $(2) $$(PRIVATE_MESSAGE) $$(PRIVATE_DIR)/src
 notice_files: $(1) $(2)
 endef

tools/releasetools/edify_generator.py

diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index 8c31927..5672b5a 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -165,9 +165,9 @@
     fstab = self.info.get("fstab", None)
     if fstab:
       p = fstab[partition]
-      self.script.append('format("%s", "%s", "%s", "%s");' %
+      self.script.append('format("%s", "%s", "%s", "%s", "%s");' %
                          (p.fs_type, common.PARTITION_TYPES[p.fs_type],
-                          p.device, p.length))
+                          p.device, p.length, p.mount_point))
 
   def DeleteFiles(self, file_list):
     """Delete all files in file_list."""