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

Commit 1488467c authored by Zhi Dou's avatar Zhi Dou Committed by Android (Google) Code Review
Browse files

Merge "Revert "Create exported mode flag library for package android.os"" into main

parents 384dc99e 147da275

AconfigFlags.bp

+0 −9
Original line number Original line Diff line number Diff line
@@ -310,8 +310,6 @@ java_aconfig_library { 
aconfig_declarations {

aconfig_declarations {

    name: "android.os.flags-aconfig",

    name: "android.os.flags-aconfig",

    package: "android.os",

    package: "android.os",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/os/*.aconfig"],

    srcs: ["core/java/android/os/*.aconfig"],

}

}
@@ -328,13 +326,6 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

}





java_aconfig_library {

    name: "android.os.flags-aconfig-java-export",

    aconfig_declarations: "android.os.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

}



// VirtualDeviceManager

// VirtualDeviceManager

cc_aconfig_library {

cc_aconfig_library {

    name: "android.companion.virtualdevice.flags-aconfig-cc",

    name: "android.companion.virtualdevice.flags-aconfig-cc",

core/java/android/os/flags.aconfig

+0 −2
Original line number Original line Diff line number Diff line 
package: "android.os"

package: "android.os"

container: "system"





flag {

flag {

    name: "android_os_build_vanilla_ice_cream"

    name: "android_os_build_vanilla_ice_cream"
@@ -41,7 +40,6 @@ flag { 
    namespace: "profile_experiences"

    namespace: "profile_experiences"

    description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion."

    description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion."

    bug: "299069460"

    bug: "299069460"

    is_exported: true

}

}





flag {

flag {