Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51970537 authored by Jooyung Han's avatar Jooyung Han
Browse files

pom2bp: add apex_available/min_sdk_version 

apex_available/min_sdk_version are required to be available for mainline
modules(APK/APEX).

- java_import/java_library_static
- android_library/android_library_import

Bug: 156996905
Test: prebuilts/sdk/update_prebuilts.sh
Merged-In: I201ebabaa533c5ee19e394ab30ca2fa0e3d7ce0e
Change-Id: I201ebabaa533c5ee19e394ab30ca2fa0e3d7ce0e
(cherry picked from commit 43d3025c)
parent 1733d6ac

cmd/pom2bp/pom2bp.go

+26 −2
Original line number Original line Diff line number Diff line
@@ -213,10 +213,14 @@ func (p Pom) IsHostAndDeviceModule() bool { 
	return hostAndDeviceModuleNames.IsHostAndDeviceModule(p.GroupId, p.ArtifactId)

	return hostAndDeviceModuleNames.IsHostAndDeviceModule(p.GroupId, p.ArtifactId)

}

}





func (p Pom) IsHostOnly() bool {

	return p.IsHostModule() && !p.IsHostAndDeviceModule()

}



func (p Pom) ModuleType() string {

func (p Pom) ModuleType() string {

	if p.IsAar() {

	if p.IsAar() {

		return "android_library"

		return "android_library"

	} else if p.IsHostModule() && !p.IsHostAndDeviceModule() {

	} else if p.IsHostOnly() {

		return "java_library_host"

		return "java_library_host"

	} else {

	} else {

		return "java_library_static"

		return "java_library_static"
@@ -226,7 +230,7 @@ func (p Pom) ModuleType() string { 
func (p Pom) ImportModuleType() string {

func (p Pom) ImportModuleType() string {

	if p.IsAar() {

	if p.IsAar() {

		return "android_library_import"

		return "android_library_import"

	} else if p.IsHostModule() && !p.IsHostAndDeviceModule() {

	} else if p.IsHostOnly() {

		return "java_import_host"

		return "java_import_host"

	} else {

	} else {

		return "java_import"

		return "java_import"
@@ -366,6 +370,12 @@ var bpTemplate = template.Must(template.New("bp").Parse(` 
    {{- if .IsHostAndDeviceModule}}

    {{- if .IsHostAndDeviceModule}}

    host_supported: true,

    host_supported: true,

    {{- end}}

    {{- end}}

    {{- if not .IsHostOnly}}

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    {{- end}}

    {{- if .IsAar}}

    {{- if .IsAar}}

    min_sdk_version: "{{.MinSdkVersion}}",

    min_sdk_version: "{{.MinSdkVersion}}",

    static_libs: [

    static_libs: [
@@ -401,6 +411,12 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(` 
    {{- if .IsHostAndDeviceModule}}

    {{- if .IsHostAndDeviceModule}}

    host_supported: true,

    host_supported: true,

    {{- end}}

    {{- end}}

    {{- if not .IsHostOnly}}

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    {{- end}}

    {{- if .IsAar}}

    {{- if .IsAar}}

    min_sdk_version: "{{.MinSdkVersion}}",

    min_sdk_version: "{{.MinSdkVersion}}",

    static_libs: [

    static_libs: [
@@ -431,9 +447,17 @@ var bpDepsTemplate = template.Must(template.New("bp").Parse(` 
    {{- if .IsHostAndDeviceModule}}

    {{- if .IsHostAndDeviceModule}}

    host_supported: true,

    host_supported: true,

    {{- end}}

    {{- end}}

    {{- if not .IsHostOnly}}

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    {{- end}}

    {{- if .IsAar}}

    {{- if .IsAar}}

    min_sdk_version: "{{.MinSdkVersion}}",

    min_sdk_version: "{{.MinSdkVersion}}",

    manifest: "manifests/{{.BpName}}/AndroidManifest.xml",

    manifest: "manifests/{{.BpName}}/AndroidManifest.xml",

    {{- else if not .IsHostOnly}}

    min_sdk_version: "24",

    {{- end}}

    {{- end}}

    {{- end}}

    {{- end}}

    static_libs: [

    static_libs: [