summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mårten Kongstad <amhk@google.com> 2024-11-21 10:49:03 +0100
committer Mårten Kongstad <amhk@google.com> 2024-11-21 13:37:07 +0100
commit23a798d29b14558ca443ad54f8b46f79c1f33e2d (patch)
treeab592dc84adbf6d0ac3adab3b36cf5d103f0842a
parentf26b150c127d21081e422f6854079e6db0a78f0f (diff)
android.sdk aconfig flags: rename soong modules
Rename the android.sdk aconfig soong modules to be consistent with the aconfig modules in frameworks/base/AconfigFlags.bp. Bug: 377689343 Test: atest 'CtsOsTestCases:BuildTest#testSdkMinorInt' Flag: EXEMPT no need to flag changes to flags themselves Change-Id: I7d1d43cc37d7f68e45b337147b86e94e958838d7
-rw-r--r--AconfigFlags.bp2
-rw-r--r--android-sdk-flags/Android.bp6
2 files changed, 4 insertions, 4 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index e18470498f39..0bce29f26b00 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -23,7 +23,6 @@ aconfig_declarations_group {
"aconfig_mediacodec_flags_java_lib",
"aconfig_settingslib_flags_java_lib",
"aconfig_trade_in_mode_flags_java_lib",
- "android-sdk-flags-java",
"android.adaptiveauth.flags-aconfig-java",
"android.app.appfunctions.flags-aconfig-java",
"android.app.assist.flags-aconfig-java",
@@ -63,6 +62,7 @@ aconfig_declarations_group {
"android.os.vibrator.flags-aconfig-java",
"android.permission.flags-aconfig-java",
"android.provider.flags-aconfig-java",
+ "android.sdk.flags-aconfig-java",
"android.security.flags-aconfig-java",
"android.server.app.flags-aconfig-java",
"android.service.autofill.flags-aconfig-java",
diff --git a/android-sdk-flags/Android.bp b/android-sdk-flags/Android.bp
index 79a0b9a4f273..d772517e2a01 100644
--- a/android-sdk-flags/Android.bp
+++ b/android-sdk-flags/Android.bp
@@ -17,14 +17,14 @@ package {
}
aconfig_declarations {
- name: "android-sdk-flags",
+ name: "android.sdk.flags-aconfig",
package: "android.sdk",
container: "system",
srcs: ["flags.aconfig"],
}
java_aconfig_library {
- name: "android-sdk-flags-java",
- aconfig_declarations: "android-sdk-flags",
+ name: "android.sdk.flags-aconfig-java",
+ aconfig_declarations: "android.sdk.flags-aconfig",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}