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

Commit d4a4013b authored by Zhi Dou's avatar Zhi Dou
Browse files

Load flags in framework from framework 

For flags in display_flags_lib, and camera_platform_flags_core_java_lib
have been added in framework. If these flags added in system again, it
will fail test
testBootClasspathAndSystemServerClasspath_nonDuplicateClasses. Since
framework jar will always be loaded, then instead of adding the flags
via `static_libs`, if the flags exist in framework, then in system
service, the same flag can be added via `libs` for building purpose. In
the runtime, the real flag will be loaded from framework.

Bug: 301945339
Test: presubmit
Change-Id: I17f753e52e549d8ac9a7086e823be025eca1e9b2
parent 378114d0

services/core/Android.bp

+15 −2
Original line number Diff line number Diff line
@@ -96,11 +96,26 @@ genrule { 
    out: ["com/android/server/location/contexthub/ContextHubStatsLog.java"],

}



/*

 * This module is used to refer aconfig flag libraries that are

 * added to the framework via static_libs.

 * These libraries are referred here via libs prevent duplication of classes in both

 * the framework and the system server.

*/

java_defaults {

    name: "shared-framework-aconfig-libs",

    libs: [

        "display_flags_lib",

        "camera_platform_flags_core_java_lib",

    ],

}



java_library_static {

    name: "services.core.unboosted",

    defaults: [

        "platform_service_defaults",

        "android.hardware.power-java_static",

        "shared-framework-aconfig-libs",

    ],

    srcs: [

        ":android.hardware.biometrics.face-V3-java-source",
@@ -181,7 +196,6 @@ java_library_static { 
        "android.hardware.power.stats-V2-java",

        "android.hidl.manager-V1.2-java",

        "cbor-java",

        "display_flags_lib",

        "icu4j_calendar_astronomer",

        "android.security.aaid_aidl-java",

        "netd-client",
@@ -193,7 +207,6 @@ java_library_static { 
        "apache-commons-math",

        "backstage_power_flags_lib",

        "notification_flags_lib",

        "camera_platform_flags_core_java_lib",

        "biometrics_flags_lib",

        "am_flags_lib",

    ],