From 6158528e152304f1259e31ff343358ff0f50c0e4 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Fri, 14 Jul 2023 16:23:39 -0700
Subject: Only allow setting presigned without preprocessed on targetSdk < 30

When targetSdk is >= 30, the system verifies that you use a valid
signature V2+ certificate. Uncompressing ndk/dex files or aligning
the zip file will break a signature V2, so these apks should really
just set preprocessed: true.

Fixes: 185811447
Test: Presubmits
Change-Id: Id89c42bcd5b5daa6eda1716bff4023423298036b
---
 java/hiddenapi.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/hiddenapi.go')

diff --git a/java/hiddenapi.go b/java/hiddenapi.go
index 4d08b8307..fe3fe7b61 100644
--- a/java/hiddenapi.go
+++ b/java/hiddenapi.go
@@ -305,7 +305,7 @@ func hiddenAPIEncodeDex(ctx android.ModuleContext, dexInput, flagsCSV android.Pa
 	})
 
 	if uncompressDex {
-		TransformZipAlign(ctx, output, encodeRuleOutput)
+		TransformZipAlign(ctx, output, encodeRuleOutput, nil)
 	}
 
 	return output
-- 
cgit v1.2.3-59-g8ed1b