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

Commit 1e04109c authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Always set apex_available in SDK snapshots. 

Also fix //apex_available:platform that could get lost in the generated
apex_available properties. It only happened if a module didn't specify
an apex_available setting and then got extra entries from
apex.BaselineApexAvailable.

Test: Build ART SDK with libnativeloader_lazy in the SDK, and check
  that the generated prebuilt module has //apex_available:platform
  (before https://r.android.com/1480559).
Change-Id: I9df20aee63455932a7e558993f0f26769cb02792
parent af3bf0dd

sdk/cc_sdk_test.go

+56 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_sdkmember@current",

    sdk_member_name: "sdkmember",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    installable: false,

    stl: "none",
@@ -131,6 +132,7 @@ cc_prebuilt_library_shared { 
    name: "sdkmember",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    stl: "none",

    compile_multilib: "64",
@@ -353,6 +355,7 @@ cc_prebuilt_object { 
    name: "mysdk_crtobj@current",

    sdk_member_name: "crtobj",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    sanitize: {
@@ -372,6 +375,7 @@ cc_prebuilt_object { 
    name: "crtobj",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    sanitize: {
@@ -480,6 +484,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    stl: "none",

    compile_multilib: "both",
@@ -511,6 +516,7 @@ cc_prebuilt_library_shared { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    export_include_dirs: ["include/include"],
@@ -575,6 +581,7 @@ cc_prebuilt_binary { 
    name: "mymodule_exports_mynativebinary@current",

    sdk_member_name: "mynativebinary",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    compile_multilib: "both",

    arch: {
@@ -591,6 +598,7 @@ cc_prebuilt_binary { 
    name: "mynativebinary",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    compile_multilib: "both",

    arch: {

        arm64: {
@@ -654,6 +662,7 @@ cc_prebuilt_binary { 
    name: "myexports_mynativebinary@current",

    sdk_member_name: "mynativebinary",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -687,6 +696,7 @@ cc_prebuilt_binary { 
    name: "mynativebinary",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -802,6 +812,7 @@ cc_prebuilt_binary { 
    name: "myexports_mynativebinary@current",

    sdk_member_name: "mynativebinary",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -822,6 +833,7 @@ cc_prebuilt_binary { 
    name: "mynativebinary",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -841,6 +853,7 @@ cc_prebuilt_library_shared { 
    name: "myexports_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -861,6 +874,7 @@ cc_prebuilt_library_shared { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -933,6 +947,7 @@ cc_prebuilt_binary { 
    name: "mymodule_exports_linker@current",

    sdk_member_name: "linker",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -959,6 +974,7 @@ cc_prebuilt_binary { 
    name: "linker",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -1167,6 +1183,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    stl: "none",

    compile_multilib: "both",
@@ -1188,6 +1205,7 @@ cc_prebuilt_library_shared { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    shared_libs: [
@@ -1208,6 +1226,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_myothernativelib@current",

    sdk_member_name: "myothernativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    stl: "none",

    compile_multilib: "both",
@@ -1226,6 +1245,7 @@ cc_prebuilt_library_shared { 
    name: "myothernativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    system_shared_libs: ["libm"],
@@ -1243,6 +1263,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mysystemnativelib@current",

    sdk_member_name: "mysystemnativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    stl: "none",

    compile_multilib: "both",
@@ -1260,6 +1281,7 @@ cc_prebuilt_library_shared { 
    name: "mysystemnativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    arch: {
@@ -1327,6 +1349,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -1355,6 +1378,7 @@ cc_prebuilt_library_shared { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    sdk_version: "minimum",
@@ -1449,6 +1473,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -1482,6 +1507,7 @@ cc_prebuilt_library_shared { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -1572,6 +1598,7 @@ cc_prebuilt_library_static { 
    name: "myexports_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    stl: "none",

    compile_multilib: "both",
@@ -1592,6 +1619,7 @@ cc_prebuilt_library_static { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    export_include_dirs: ["include/include"],
@@ -1660,6 +1688,7 @@ cc_prebuilt_library_static { 
    name: "myexports_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -1687,6 +1716,7 @@ cc_prebuilt_library_static { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -1769,6 +1799,7 @@ cc_prebuilt_library { 
    name: "myexports_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    recovery_available: true,

    vendor_available: true,
@@ -1799,6 +1830,7 @@ cc_prebuilt_library { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    recovery_available: true,

    vendor_available: true,

    stl: "none",
@@ -1877,6 +1909,7 @@ cc_prebuilt_library_static { 
    name: "myexports_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    installable: false,
@@ -1899,6 +1932,7 @@ cc_prebuilt_library_static { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -1964,6 +1998,7 @@ cc_prebuilt_library_headers { 
    name: "mysdk_mynativeheaders@current",

    sdk_member_name: "mynativeheaders",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    export_include_dirs: ["include/include"],
@@ -1973,6 +2008,7 @@ cc_prebuilt_library_headers { 
    name: "mynativeheaders",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    stl: "none",

    compile_multilib: "both",

    export_include_dirs: ["include/include"],
@@ -2016,6 +2052,7 @@ cc_prebuilt_library_headers { 
    name: "mysdk_mynativeheaders@current",

    sdk_member_name: "mynativeheaders",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -2038,6 +2075,7 @@ cc_prebuilt_library_headers { 
    name: "mynativeheaders",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    stl: "none",
@@ -2113,6 +2151,7 @@ cc_prebuilt_library_headers { 
    name: "mysdk_mynativeheaders@current",

    sdk_member_name: "mynativeheaders",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    stl: "none",

    compile_multilib: "both",
@@ -2140,6 +2179,7 @@ cc_prebuilt_library_headers { 
    name: "mynativeheaders",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    stl: "none",

    compile_multilib: "both",
@@ -2220,6 +2260,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_sslnil@current",

    sdk_member_name: "sslnil",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    compile_multilib: "both",

    arch: {
@@ -2236,6 +2277,7 @@ cc_prebuilt_library_shared { 
    name: "sslnil",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    compile_multilib: "both",

    arch: {

        arm64: {
@@ -2251,6 +2293,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_sslempty@current",

    sdk_member_name: "sslempty",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    compile_multilib: "both",

    system_shared_libs: [],
@@ -2268,6 +2311,7 @@ cc_prebuilt_library_shared { 
    name: "sslempty",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    compile_multilib: "both",

    system_shared_libs: [],

    arch: {
@@ -2284,6 +2328,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_sslnonempty@current",

    sdk_member_name: "sslnonempty",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    compile_multilib: "both",

    system_shared_libs: ["mysdk_sslnil@current"],
@@ -2301,6 +2346,7 @@ cc_prebuilt_library_shared { 
    name: "sslnonempty",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    compile_multilib: "both",

    system_shared_libs: ["sslnil"],

    arch: {
@@ -2350,6 +2396,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_sslvariants@current",

    sdk_member_name: "sslvariants",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    installable: false,

    compile_multilib: "both",
@@ -2381,6 +2428,7 @@ cc_prebuilt_library_shared { 
    name: "sslvariants",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    compile_multilib: "both",

    target: {
@@ -2456,6 +2504,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_stubslib@current",

    sdk_member_name: "stubslib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    compile_multilib: "both",

    stubs: {
@@ -2479,6 +2528,7 @@ cc_prebuilt_library_shared { 
    name: "stubslib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    compile_multilib: "both",

    stubs: {

        versions: [
@@ -2537,6 +2587,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_stubslib@current",

    sdk_member_name: "stubslib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    installable: false,

    compile_multilib: "both",
@@ -2572,6 +2623,7 @@ cc_prebuilt_library_shared { 
    name: "stubslib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    compile_multilib: "both",

    stubs: {
@@ -2645,6 +2697,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mylib@current",

    sdk_member_name: "mylib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    installable: false,

    unique_host_soname: true,
@@ -2674,6 +2727,7 @@ cc_prebuilt_library_shared { 
    name: "mylib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    unique_host_soname: true,

    compile_multilib: "both",
@@ -2755,6 +2809,7 @@ cc_prebuilt_library_shared { 
    name: "mysdk_mynativelib@current",

    sdk_member_name: "mynativelib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    installable: false,

    compile_multilib: "both",

    export_include_dirs: ["include/include"],
@@ -2772,6 +2827,7 @@ cc_prebuilt_library_shared { 
    name: "mynativelib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    compile_multilib: "both",

    export_include_dirs: ["include/include"],

    arch: {

sdk/exports_test.go

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ java_import { 
    name: "myexports_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -57,6 +58,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}

sdk/java_sdk_test.go

+34 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ java_import { 
    name: "mysdk_sdkmember@current",

    sdk_member_name: "sdkmember",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/sdkmember.jar"],

}
@@ -129,6 +130,7 @@ java_import { 
    name: "sdkmember",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/sdkmember.jar"],

}
@@ -247,6 +249,7 @@ java_import { 
    name: "mysdk_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -254,6 +257,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -302,6 +306,7 @@ java_import { 
    name: "mysdk_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/myjavalib.jar"],
@@ -311,6 +316,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/myjavalib.jar"],
@@ -357,6 +363,7 @@ java_import { 
    name: "mysdk_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    target: {

        android: {
@@ -372,6 +379,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    target: {

        android: {
@@ -426,6 +434,7 @@ java_import { 
    name: "myexports_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -433,6 +442,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -481,6 +491,7 @@ java_import { 
    name: "myexports_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/myjavalib.jar"],
@@ -490,6 +501,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/myjavalib.jar"],
@@ -535,6 +547,7 @@ java_test_import { 
    name: "myexports_myjavatests@current",

    sdk_member_name: "myjavatests",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavatests.jar"],

    test_config: "java/myjavatests-AndroidTest.xml",

}
@@ -543,6 +556,7 @@ java_test_import { 
    name: "myjavatests",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavatests.jar"],

    test_config: "java/myjavatests-AndroidTest.xml",

}
@@ -588,6 +602,7 @@ java_test_import { 
    name: "myexports_myjavatests@current",

    sdk_member_name: "myjavatests",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/myjavatests.jar"],
@@ -598,6 +613,7 @@ java_test_import { 
    name: "myjavatests",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/myjavatests.jar"],
@@ -797,6 +813,7 @@ java_import { 
    name: "mysdk_exported-system-module@current",

    sdk_member_name: "exported-system-module",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/exported-system-module.jar"],

}
@@ -804,6 +821,7 @@ java_import { 
    name: "exported-system-module",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/exported-system-module.jar"],

}
@@ -811,6 +829,7 @@ java_import { 
    name: "mysdk_system-module@current",

    sdk_member_name: "system-module",

    visibility: ["//visibility:private"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/system-module.jar"],

}
@@ -818,6 +837,7 @@ java_import { 
    name: "mysdk_system-module",

    prefer: false,

    visibility: ["//visibility:private"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/system-module.jar"],

}
@@ -889,6 +909,7 @@ java_import { 
    name: "mysdk_system-module@current",

    sdk_member_name: "system-module",

    visibility: ["//visibility:private"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/system-module.jar"],
@@ -898,6 +919,7 @@ java_import { 
    name: "mysdk_system-module",

    prefer: false,

    visibility: ["//visibility:private"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/system-module.jar"],
@@ -978,6 +1000,7 @@ java_import { 
    name: "myexports_hostjavalib@current",

    sdk_member_name: "hostjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/hostjavalib.jar"],
@@ -987,6 +1010,7 @@ java_import { 
    name: "hostjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    device_supported: false,

    host_supported: true,

    jars: ["java/hostjavalib.jar"],
@@ -996,6 +1020,7 @@ java_import { 
    name: "myexports_androidjavalib@current",

    sdk_member_name: "androidjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/androidjavalib.jar"],

}
@@ -1003,6 +1028,7 @@ java_import { 
    name: "androidjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/androidjavalib.jar"],

}
@@ -1010,6 +1036,7 @@ java_import { 
    name: "myexports_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    target: {

        android: {
@@ -1025,6 +1052,7 @@ java_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    host_supported: true,

    target: {

        android: {
@@ -1187,6 +1215,7 @@ java_sdk_library_import { 
    name: "mysdk_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],
@@ -1201,6 +1230,7 @@ java_sdk_library_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],
@@ -1254,6 +1284,7 @@ java_sdk_library_import { 
    name: "mysdk_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],
@@ -1268,6 +1299,7 @@ java_sdk_library_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: true,

    public: {

        jars: ["sdk_library/public/myjavalib-stubs.jar"],
@@ -1689,6 +1721,7 @@ java_sdk_library_import { 
    name: "mysdk_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: true,

    doctag_files: ["doctags/docs/known_doctags"],

    public: {
@@ -1704,6 +1737,7 @@ java_sdk_library_import { 
    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    shared_library: true,

    doctag_files: ["doctags/docs/known_doctags"],

    public: {

sdk/sdk_test.go

+8 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ java_import { 
        "//package",

        "//prebuilts/mysdk",

    ],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -192,6 +193,7 @@ java_import { 
        "//package",

        "//prebuilts/mysdk",

    ],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}
@@ -199,6 +201,7 @@ java_import { 
    name: "mysdk_mypublicjavalib@current",

    sdk_member_name: "mypublicjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/mypublicjavalib.jar"],

}
@@ -206,6 +209,7 @@ java_import { 
    name: "mypublicjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/mypublicjavalib.jar"],

}
@@ -217,6 +221,7 @@ java_import { 
        "//package",

        "//prebuilts/mysdk",

    ],

    apex_available: ["//apex_available:platform"],

    jars: ["java/mydefaultedjavalib.jar"],

}
@@ -228,6 +233,7 @@ java_import { 
        "//package",

        "//prebuilts/mysdk",

    ],

    apex_available: ["//apex_available:platform"],

    jars: ["java/mydefaultedjavalib.jar"],

}
@@ -238,6 +244,7 @@ java_import { 
        "//package",

        "//prebuilts/mysdk",

    ],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myprivatejavalib.jar"],

}
@@ -248,6 +255,7 @@ java_import { 
        "//package",

        "//prebuilts/mysdk",

    ],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myprivatejavalib.jar"],

}

sdk/update.go

+18 −16
Original line number Diff line number Diff line
@@ -735,36 +735,38 @@ func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType 
		}

	}



	deviceSupported := false

	hostSupported := false



	for _, variant := range member.Variants() {

		osClass := variant.Target().Os.Class

		if osClass == android.Host {

			hostSupported = true

		} else if osClass == android.Device {

			deviceSupported = true

		}

	}



	addHostDeviceSupportedProperties(deviceSupported, hostSupported, m)



	// Where available copy apex_available properties from the member.

	if apexAware, ok := variant.(interface{ ApexAvailable() []string }); ok {

		apexAvailable := apexAware.ApexAvailable()

		if len(apexAvailable) == 0 {

			// //apex_available:platform is the default.

			apexAvailable = []string{android.AvailableToPlatform}

		}



		// Add in any baseline apex available settings.

		apexAvailable = append(apexAvailable, apex.BaselineApexAvailable(member.Name())...)



		if len(apexAvailable) > 0 {

		// Remove duplicates and sort.

		apexAvailable = android.FirstUniqueStrings(apexAvailable)

		sort.Strings(apexAvailable)



		m.AddProperty("apex_available", apexAvailable)

	}



	deviceSupported := false

	hostSupported := false



	for _, variant := range member.Variants() {

		osClass := variant.Target().Os.Class

		if osClass == android.Host {

			hostSupported = true

		} else if osClass == android.Device {

			deviceSupported = true

		}

	}



	addHostDeviceSupportedProperties(deviceSupported, hostSupported, m)



	// Disable installation in the versioned module of those modules that are ever installable.

	if installable, ok := variant.(interface{ EverInstallable() bool }); ok {

		if installable.EverInstallable() {