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

Commit 5b9160e9 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Split android_non_updatable_stubs_libs 

This change moves the entries android-non-updatable-stubs-defaults.libs
out of the module to an independent list, so that it can be utilized in
both stubs_default module and a java_default module. Utilization of the
java_default module will be done in a child change.

Test: m nothing
Bug: 327507877
Change-Id: Ia8aec25c6c6a199f36a69062754f5b02b15fdb59
parent fa3a20fc

api/Android.bp

+23 −12
Original line number Diff line number Diff line
@@ -298,6 +298,28 @@ packages_to_document = [ 
    "org.xmlpull",

]



// These are libs from framework-internal-utils that are required (i.e. being referenced)

// from framework-non-updatable-sources. Add more here when there's a need.

// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular

// dependencies gets bigger.

android_non_updatable_stubs_libs = [

    "android.hardware.cas-V1.2-java",

    "android.hardware.health-V1.0-java-constants",

    "android.hardware.thermal-V1.0-java-constants",

    "android.hardware.thermal-V2.0-java",

    "android.hardware.tv.input-V1.0-java-constants",

    "android.hardware.usb-V1.0-java-constants",

    "android.hardware.usb-V1.1-java-constants",

    "android.hardware.usb.gadget-V1.0-java",

    "android.hardware.vibrator-V1.3-java",

    "framework-protos",

]



java_defaults {

    name: "android-non-updatable-stubs-libs-defaults",

    libs: android_non_updatable_stubs_libs,

}



// Defaults for all stubs that include the non-updatable framework. These defaults do not include

// module symbols, so will not compile correctly on their own. Users must add module APIs to the

// classpath (or sources) somehow.
@@ -329,18 +351,7 @@ stubs_defaults { 
    // from framework-non-updatable-sources. Add more here when there's a need.

    // DO NOT add the entire framework-internal-utils. It might cause unnecessary circular

    // dependencies gets bigger.

    libs: [

        "android.hardware.cas-V1.2-java",

        "android.hardware.health-V1.0-java-constants",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V2.0-java",

        "android.hardware.tv.input-V1.0-java-constants",

        "android.hardware.usb-V1.0-java-constants",

        "android.hardware.usb-V1.1-java-constants",

        "android.hardware.usb.gadget-V1.0-java",

        "android.hardware.vibrator-V1.3-java",

        "framework-protos",

    ],

    libs: android_non_updatable_stubs_libs,

    flags: [

        "--error NoSettingsProvider",

        "--error UnhiddenSystemApi",