diff options
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/apex.go | 12 | ||||
| -rw-r--r-- | apex/apex_test.go | 1 | ||||
| -rw-r--r-- | apex/builder.go | 12 |
3 files changed, 0 insertions, 25 deletions
diff --git a/apex/apex.go b/apex/apex.go index fb0d73068..b0d2b54a7 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -147,9 +147,6 @@ type apexBundleProperties struct { // Default: true. Installable *bool - // Deprecated. Do not use. TODO(b/350644693) remove this after removing all usage - Use_vndk_as_stable *bool - // The type of filesystem to use. Either 'ext4', 'f2fs' or 'erofs'. Default 'ext4'. Payload_fs_type *string @@ -157,10 +154,6 @@ type apexBundleProperties struct { // Default is false. Ignore_system_library_special_case *bool - // Whenever apex_payload.img of the APEX should include dm-verity hashtree. - // Default value is true. - Generate_hashtree *bool - // Whenever apex_payload.img of the APEX should not be dm-verity signed. Should be only // used in tests. Test_only_unsigned_payload *bool @@ -1326,11 +1319,6 @@ func (a *apexBundle) installable() bool { return !a.properties.PreventInstall && (a.properties.Installable == nil || proptools.Bool(a.properties.Installable)) } -// See the generate_hashtree property -func (a *apexBundle) shouldGenerateHashtree() bool { - return proptools.BoolDefault(a.properties.Generate_hashtree, true) -} - // See the test_only_unsigned_payload property func (a *apexBundle) testOnlyShouldSkipPayloadSign() bool { return proptools.Bool(a.properties.Test_only_unsigned_payload) diff --git a/apex/apex_test.go b/apex/apex_test.go index ced3c46d5..81a62d9d9 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -7431,7 +7431,6 @@ func TestLegacyAndroid10Support(t *testing.T) { module := ctx.ModuleForTests("myapex", "android_common_myapex") args := module.Rule("apexRule").Args ensureContains(t, args["opt_flags"], "--manifest_json "+module.Output("apex_manifest.json").Output.String()) - ensureNotContains(t, args["opt_flags"], "--no_hashtree") // The copies of the libraries in the apex should have one more dependency than // the ones outside the apex, namely the unwinder. Ideally we should check diff --git a/apex/builder.go b/apex/builder.go index 45608c933..a3343c338 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -764,18 +764,6 @@ func (a *apexBundle) buildApex(ctx android.ModuleContext) { implicitInputs = append(implicitInputs, noticeAssetPath) optFlags = append(optFlags, "--assets_dir "+filepath.Dir(noticeAssetPath.String())) - // Apexes which are supposed to be installed in builtin dirs(/system, etc) - // don't need hashtree for activation. Therefore, by removing hashtree from - // apex bundle (filesystem image in it, to be specific), we can save storage. - needHashTree := moduleMinSdkVersion.LessThanOrEqualTo(android.SdkVersion_Android10) || - a.shouldGenerateHashtree() - if ctx.Config().ApexCompressionEnabled() && a.isCompressable() { - needHashTree = true - } - if !needHashTree { - optFlags = append(optFlags, "--no_hashtree") - } - if a.testOnlyShouldSkipPayloadSign() { optFlags = append(optFlags, "--unsigned_payload") } |