From f99ba271012cd602b454291f73a84c559fea6189 Mon Sep 17 00:00:00 2001 From: Jack He Date: Tue, 6 Apr 2021 18:52:50 +0000 Subject: [PATCH] Revert "Set min_sdk_version for java imports in pom2bp" Revert "Give pom2bp -default-min-sdk-version 24 param" Revert submission 1662079-axd Bug: 184656328 Reason for revert: Break build Reverted Changes: I2f4dc7585:Update androidx min_sdk_version in allowed_deps I5cb8c736d:Give pom2bp -default-min-sdk-version 24 param I3b029315a:Set min_sdk_version for java imports in pom2bp Change-Id: Ic97cbd1714f6113188ad4647ce71105f9641fad7 --- cmd/pom2bp/pom2bp.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/pom2bp/pom2bp.go b/cmd/pom2bp/pom2bp.go index d31489e3a..d9116b081 100644 --- a/cmd/pom2bp/pom2bp.go +++ b/cmd/pom2bp/pom2bp.go @@ -401,8 +401,6 @@ var bpTemplate = template.Must(template.New("bp").Parse(` {{- end}} ], {{- end}} - {{- else if not .IsHostOnly}} - min_sdk_version: "{{.DefaultMinSdkVersion}}", {{- end}} } `)) @@ -444,8 +442,6 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(` {{- end}} ], {{- end}} - {{- else if not .IsHostOnly}} - min_sdk_version: "{{.DefaultMinSdkVersion}}", {{- end}} }