Merge "Push ISA features into system properties" into lmp-dev
diff --git a/core/post_clean.mk b/core/post_clean.mk
index f7e654b..0273ff2 100644
--- a/core/post_clean.mk
+++ b/core/post_clean.mk
@@ -82,7 +82,7 @@
# For modules not loaded by the current build (e.g. you are running mm/mmm),
# we copy the info from the previous bulid.
-$(foreach p, $(filter-out $(modules_with_aidl_files),$(MODULES_WITH_AIDL_FILES)),\
+$(foreach p, $(filter-out $(ALL_MODULES),$(MODULES_WITH_AIDL_FILES)),\
$(shell echo 'AIDL_FILES.$(p) := $(AIDL_FILES.$(p))' >> $(current_aidl_config)))
MODULES_WITH_AIDL_FILES := $(sort $(MODULES_WITH_AIDL_FILES) $(modules_with_aidl_files))
$(shell echo 'MODULES_WITH_AIDL_FILES := $(MODULES_WITH_AIDL_FILES)' >> $(current_aidl_config))
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 4fe4938..09798bc 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -355,22 +355,28 @@
info_dict=None):
"""Return a File object (with name 'name') with the desired bootable
image. Look for it in 'unpack_dir'/BOOTABLE_IMAGES under the name
- 'prebuilt_name', otherwise construct it from the source files in
+ 'prebuilt_name', otherwise look for it under 'unpack_dir'/IMAGES,
+ otherwise construct it from the source files in
'unpack_dir'/'tree_subdir'."""
prebuilt_path = os.path.join(unpack_dir, "BOOTABLE_IMAGES", prebuilt_name)
if os.path.exists(prebuilt_path):
- print "using prebuilt %s..." % (prebuilt_name,)
+ print "using prebuilt %s from BOOTABLE_IMAGES..." % (prebuilt_name,)
return File.FromLocalFile(name, prebuilt_path)
- else:
- print "building image from target_files %s..." % (tree_subdir,)
- fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
- data = BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
- os.path.join(unpack_dir, fs_config),
- info_dict)
- if data:
- return File(name, data)
- return None
+
+ prebuilt_path = os.path.join(unpack_dir, "IMAGES", prebuilt_name)
+ if os.path.exists(prebuilt_path):
+ print "using prebuilt %s from IMAGES..." % (prebuilt_name,)
+ return File.FromLocalFile(name, prebuilt_path)
+
+ print "building image from target_files %s..." % (tree_subdir,)
+ fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt"
+ data = BuildBootableImage(os.path.join(unpack_dir, tree_subdir),
+ os.path.join(unpack_dir, fs_config),
+ info_dict)
+ if data:
+ return File(name, data)
+ return None
def UnzipTemp(filename, pattern=None):