Cleanup Flag definitions and moves lib to fw/b
Move the canonical flag lib def to only be in fw/b and remove
duplicate lib creation
Test: Build
Flag: mk only change
Change-Id: I6d17371e296fb594dd8c0f082146f588901481d1
diff --git a/Android.bp b/Android.bp
index 63c8a8c..f46c206 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,7 +28,7 @@
static_libs: [
"androidx.annotation_annotation",
"androidx.core_core",
- "telecom_flags-lib",
+ "telecom_flags_core_java_lib",
],
libs: [
"services",
@@ -62,7 +62,7 @@
"androidx.fragment_fragment",
"androidx.test.ext.junit",
"platform-compat-test-rules",
- "telecom_flags-lib",
+ "telecom_flags_core_java_lib",
],
srcs: [
"tests/src/**/*.java",
diff --git a/flags/Android.bp b/flags/Android.bp
index 37a7094..1baee87 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -31,8 +31,3 @@
"telecom_callaudioroutestatemachine_flags.aconfig"
],
}
-
-java_aconfig_library {
- name: "telecom_flags-lib",
- aconfig_declarations: "telecom_flags"
-}
\ No newline at end of file