Merge "Revert "Default to nostripping for non /system preopt""
diff --git a/core/android_manifest.mk b/core/android_manifest.mk
index 3af81ff..517379a 100644
--- a/core/android_manifest.mk
+++ b/core/android_manifest.mk
@@ -47,7 +47,7 @@
ifneq (,$(strip $(my_full_libs_manifest_files)))
$(full_android_manifest): PRIVATE_LIBS_MANIFESTS := $(my_full_libs_manifest_files)
-$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_CLASSPATH)
+$(full_android_manifest): $(ANDROID_MANIFEST_MERGER_DEPS)
$(full_android_manifest) : $(main_android_manifest) $(my_full_libs_manifest_files)
@echo "Merge android manifest files: $@ <-- $< $(PRIVATE_LIBS_MANIFESTS)"
@mkdir -p $(dir $@)
diff --git a/core/config.mk b/core/config.mk
index 06c73ee..967ab5e 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -723,19 +723,6 @@
FINDBUGS_DIR := external/owasp/sanitizer/tools/findbugs/bin
FINDBUGS := $(FINDBUGS_DIR)/findbugs
-# Tool to merge AndroidManifest.xmls
-ANDROID_MANIFEST_MERGER_CLASSPATH := \
- prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/26.1.0/manifest-merger-26.1.0.jar \
- prebuilts/gradle-plugin/com/android/tools/common/26.1.0/common-26.1.0.jar \
- prebuilts/gradle-plugin/com/android/tools/sdk-common/26.1.0/sdk-common-26.1.0.jar \
- prebuilts/gradle-plugin/com/android/tools/sdklib/26.1.0/sdklib-26.1.0.jar \
- prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-runtime/1.0.5/kotlin-runtime-1.0.5.jar \
- prebuilts/gradle-plugin/org/jetbrains/kotlin/kotlin-stdlib/1.1.3/kotlin-stdlib-1.1.3.jar \
- prebuilts/misc/common/guava/guava-21.0.jar
-ANDROID_MANIFEST_MERGER := $(JAVA) \
- -classpath $(subst $(space),:,$(strip $(ANDROID_MANIFEST_MERGER_CLASSPATH))) \
- com.android.manifmerger.Merger
-
COLUMN:= column
USE_OPENJDK9 := true
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 24c5b2d..e82e66a 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -270,7 +270,6 @@
USED_IMGDIFF_LARGE_APK = "Large APK files split and diff'd with imgdiff"
# Reasons for not applying imgdiff on APKs.
- SKIPPED_TRIMMED = "Not used imgdiff due to trimmed RangeSet"
SKIPPED_NONMONOTONIC = "Not used imgdiff due to having non-monotonic ranges"
SKIPPED_SHARED_BLOCKS = "Not used imgdiff due to using shared blocks"
SKIPPED_INCOMPLETE = "Not used imgdiff due to incomplete RangeSet"
@@ -279,7 +278,6 @@
REASONS = (
USED_IMGDIFF,
USED_IMGDIFF_LARGE_APK,
- SKIPPED_TRIMMED,
SKIPPED_NONMONOTONIC,
SKIPPED_SHARED_BLOCKS,
SKIPPED_INCOMPLETE,
@@ -449,10 +447,6 @@
self.imgdiff_stats.Log(name, ImgdiffStats.SKIPPED_INCOMPLETE)
return False
- if tgt_ranges.extra.get('trimmed') or src_ranges.extra.get('trimmed'):
- self.imgdiff_stats.Log(name, ImgdiffStats.SKIPPED_TRIMMED)
- return False
-
reason = (ImgdiffStats.USED_IMGDIFF_LARGE_APK if large_apk
else ImgdiffStats.USED_IMGDIFF)
self.imgdiff_stats.Log(name, reason)
@@ -836,14 +830,10 @@
str(xf.tgt_ranges), str(xf.src_ranges)))
else:
if xf.patch:
- # We have already generated the patch with imgdiff. Check if the
- # transfer is intact.
+ # We have already generated the patch with imgdiff, while
+ # splitting large APKs (i.e. in FindTransfers()).
assert not self.disable_imgdiff
imgdiff = True
- if (xf.src_ranges.extra.get('trimmed') or
- xf.tgt_ranges.extra.get('trimmed')):
- imgdiff = False
- xf.patch = None
else:
imgdiff = self.CanUseImgdiff(
xf.tgt_name, xf.tgt_ranges, xf.src_ranges)
@@ -1045,42 +1035,6 @@
for i, xf in enumerate(L):
xf.order = i
- def RemoveBackwardEdges(self):
- print("Removing backward edges...")
- in_order = 0
- out_of_order = 0
- lost_source = 0
-
- for xf in self.transfers:
- lost = 0
- size = xf.src_ranges.size()
- for u in xf.goes_before:
- # xf should go before u
- if xf.order < u.order:
- # it does, hurray!
- in_order += 1
- else:
- # it doesn't, boo. trim the blocks that u writes from xf's
- # source, so that xf can go after u.
- out_of_order += 1
- assert xf.src_ranges.overlaps(u.tgt_ranges)
- xf.src_ranges = xf.src_ranges.subtract(u.tgt_ranges)
- xf.src_ranges.extra['trimmed'] = True
-
- if xf.style == "diff" and not xf.src_ranges:
- # nothing left to diff from; treat as new data
- xf.style = "new"
-
- lost = size - xf.src_ranges.size()
- lost_source += lost
-
- print((" %d/%d dependencies (%.2f%%) were violated; "
- "%d source blocks removed.") %
- (out_of_order, in_order + out_of_order,
- (out_of_order * 100.0 / (in_order + out_of_order))
- if (in_order + out_of_order) else 0.0,
- lost_source))
-
def ReverseBackwardEdges(self):
"""Reverse unsatisfying edges and compute pairs of stashed blocks.
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 14d0ca4..364d6ac 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -654,12 +654,25 @@
# if they contain all zeros. We can't reconstruct such a file from its block
# list. Tag such entries accordingly. (Bug: 65213616)
for entry in image.file_map:
- # "/system/framework/am.jar" => "SYSTEM/framework/am.jar".
- arcname = string.replace(entry, which, which.upper(), 1)[1:]
# Skip artificial names, such as "__ZERO", "__NONZERO-1".
- if arcname not in input_zip.namelist():
+ if not entry.startswith('/'):
continue
+ # "/system/framework/am.jar" => "SYSTEM/framework/am.jar". Note that when
+ # using system_root_image, the filename listed in system.map may contain an
+ # additional leading slash (i.e. "//system/framework/am.jar"). Using lstrip
+ # to get consistent results.
+ arcname = string.replace(entry, which, which.upper(), 1).lstrip('/')
+
+ # Special handling another case with system_root_image, where files not
+ # under /system (e.g. "/sbin/charger") are packed under ROOT/ in a
+ # target_files.zip.
+ if which == 'system' and not arcname.startswith('SYSTEM'):
+ arcname = 'ROOT/' + arcname
+
+ assert arcname in input_zip.namelist(), \
+ "Failed to find the ZIP entry for {}".format(entry)
+
info = input_zip.getinfo(arcname)
ranges = image.file_map[entry]
diff --git a/tools/releasetools/test_blockimgdiff.py b/tools/releasetools/test_blockimgdiff.py
index ceada18..124b4d5 100644
--- a/tools/releasetools/test_blockimgdiff.py
+++ b/tools/releasetools/test_blockimgdiff.py
@@ -203,8 +203,8 @@
self.assertDictEqual(
{
- ImgdiffStats.USED_IMGDIFF : {"/system/app/app1.apk"},
- ImgdiffStats.USED_IMGDIFF_LARGE_APK : {"/vendor/app/app2.apk"},
+ ImgdiffStats.USED_IMGDIFF: {"/system/app/app1.apk"},
+ ImgdiffStats.USED_IMGDIFF_LARGE_APK: {"/vendor/app/app2.apk"},
},
block_image_diff.imgdiff_stats.stats)
@@ -229,13 +229,6 @@
"/system/app/app2.apk", RangeSet("10-15"),
RangeSet("15-20 30 10-14")))
- # At least one of the ranges has been modified.
- src_ranges = RangeSet("0-5")
- src_ranges.extra['trimmed'] = True
- self.assertFalse(
- block_image_diff.CanUseImgdiff(
- "/vendor/app/app3.apk", RangeSet("10-15"), src_ranges))
-
# At least one of the ranges is incomplete.
src_ranges = RangeSet("0-5")
src_ranges.extra['incomplete'] = True
@@ -246,8 +239,7 @@
# The stats are correctly logged.
self.assertDictEqual(
{
- ImgdiffStats.SKIPPED_NONMONOTONIC : {'/system/app/app2.apk'},
- ImgdiffStats.SKIPPED_TRIMMED : {'/vendor/app/app3.apk'},
+ ImgdiffStats.SKIPPED_NONMONOTONIC: {'/system/app/app2.apk'},
ImgdiffStats.SKIPPED_INCOMPLETE: {'/vendor/app/app4.apk'},
},
block_image_diff.imgdiff_stats.stats)
diff --git a/tools/releasetools/test_common.py b/tools/releasetools/test_common.py
index f211b03..1c75d19 100644
--- a/tools/releasetools/test_common.py
+++ b/tools/releasetools/test_common.py
@@ -662,6 +662,74 @@
self.assertFalse(sparse_image.file_map['/system/file1'].extra)
self.assertTrue(sparse_image.file_map['/system/file2'].extra['incomplete'])
+ def test_GetSparseImage_systemRootImage_filenameWithExtraLeadingSlash(self):
+ target_files = common.MakeTempFile(prefix='target_files-', suffix='.zip')
+ with zipfile.ZipFile(target_files, 'w') as target_files_zip:
+ target_files_zip.write(
+ test_utils.construct_sparse_image([(0xCAC2, 16)]),
+ arcname='IMAGES/system.img')
+ target_files_zip.writestr(
+ 'IMAGES/system.map',
+ '\n'.join([
+ '//system/file1 1-5 9-10',
+ '//system/file2 11-12',
+ '/system/app/file3 13-15']))
+ target_files_zip.writestr('SYSTEM/file1', os.urandom(4096 * 7))
+ # '/system/file2' has less blocks listed (2) than actual (3).
+ target_files_zip.writestr('SYSTEM/file2', os.urandom(4096 * 3))
+ # '/system/app/file3' has less blocks listed (3) than actual (4).
+ target_files_zip.writestr('SYSTEM/app/file3', os.urandom(4096 * 4))
+
+ tempdir = common.UnzipTemp(target_files)
+ with zipfile.ZipFile(target_files, 'r') as input_zip:
+ sparse_image = common.GetSparseImage('system', tempdir, input_zip, False)
+
+ self.assertFalse(sparse_image.file_map['//system/file1'].extra)
+ self.assertTrue(sparse_image.file_map['//system/file2'].extra['incomplete'])
+ self.assertTrue(
+ sparse_image.file_map['/system/app/file3'].extra['incomplete'])
+
+ def test_GetSparseImage_systemRootImage_nonSystemFiles(self):
+ target_files = common.MakeTempFile(prefix='target_files-', suffix='.zip')
+ with zipfile.ZipFile(target_files, 'w') as target_files_zip:
+ target_files_zip.write(
+ test_utils.construct_sparse_image([(0xCAC2, 16)]),
+ arcname='IMAGES/system.img')
+ target_files_zip.writestr(
+ 'IMAGES/system.map',
+ '\n'.join([
+ '//system/file1 1-5 9-10',
+ '//init.rc 13-15']))
+ target_files_zip.writestr('SYSTEM/file1', os.urandom(4096 * 7))
+ # '/init.rc' has less blocks listed (3) than actual (4).
+ target_files_zip.writestr('ROOT/init.rc', os.urandom(4096 * 4))
+
+ tempdir = common.UnzipTemp(target_files)
+ with zipfile.ZipFile(target_files, 'r') as input_zip:
+ sparse_image = common.GetSparseImage('system', tempdir, input_zip, False)
+
+ self.assertFalse(sparse_image.file_map['//system/file1'].extra)
+ self.assertTrue(sparse_image.file_map['//init.rc'].extra['incomplete'])
+
+ def test_GetSparseImage_fileNotFound(self):
+ target_files = common.MakeTempFile(prefix='target_files-', suffix='.zip')
+ with zipfile.ZipFile(target_files, 'w') as target_files_zip:
+ target_files_zip.write(
+ test_utils.construct_sparse_image([(0xCAC2, 16)]),
+ arcname='IMAGES/system.img')
+ target_files_zip.writestr(
+ 'IMAGES/system.map',
+ '\n'.join([
+ '//system/file1 1-5 9-10',
+ '//system/file2 11-12']))
+ target_files_zip.writestr('SYSTEM/file1', os.urandom(4096 * 7))
+
+ tempdir = common.UnzipTemp(target_files)
+ with zipfile.ZipFile(target_files, 'r') as input_zip:
+ self.assertRaises(
+ AssertionError, common.GetSparseImage, 'system', tempdir, input_zip,
+ False)
+
class InstallRecoveryScriptFormatTest(unittest.TestCase):
"""Checks the format of install-recovery.sh.
