Revert "Create exported mode flag library for package android.os"
This reverts commit 3256901e595140e3e4a714846bace53367bdde15.
Reason for revert: Likely culprit for b/327606846. Will be running through ABTD for confirmation and before submitting the revert.
Change-Id: I7332c0350413f9a2552df92ca2d5f7f4eb2bb2b3
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index eed248b..2047168 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -310,8 +310,6 @@
aconfig_declarations {
name: "android.os.flags-aconfig",
package: "android.os",
- exportable: true,
- container: "system",
srcs: ["core/java/android/os/*.aconfig"],
}
@@ -328,13 +326,6 @@
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
cc_aconfig_library {
name: "android.companion.virtualdevice.flags-aconfig-cc",
diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig
index d9400ac..abfa4e3 100644
--- a/core/java/android/os/flags.aconfig
+++ b/core/java/android/os/flags.aconfig
@@ -1,5 +1,4 @@
package: "android.os"
-container: "system"
flag {
name: "android_os_build_vanilla_ice_cream"
@@ -41,7 +40,6 @@
namespace: "profile_experiences"
description: "Guards a new Private Profile type in UserManager - everything from its setup to config to deletion."
bug: "299069460"
- is_exported: true
}
flag {