Use hal_attribute for all HALs.
Bug: 72757373
Test: policy builds
Change-Id: I7cc5e28aac8ed381c9c350f540826e069941f6c4
diff --git a/public/attributes b/public/attributes
index f645766..68696a1 100644
--- a/public/attributes
+++ b/public/attributes
@@ -220,47 +220,20 @@
# HALs should be able to communicate with those devices through sockets.
attribute hal_automotive_socket_exemption;
-# TODO(b/72757373): Use hal_attribute macro once expandattribute value conflicts
-# can be resolve.
-attribute hal_audio;
-attribute hal_audio_client;
-expandattribute hal_audio_client true;
-attribute hal_audio_server;
-expandattribute hal_audio_server false;
-
-attribute hal_bootctl;
-attribute hal_bootctl_client;
-expandattribute hal_bootctl_client true;
-attribute hal_bootctl_server;
-expandattribute hal_bootctl_server false;
-
-attribute hal_camera;
-attribute hal_camera_client;
-expandattribute hal_camera_client true;
-attribute hal_camera_server;
-expandattribute hal_camera_server false;
-
-attribute hal_drm;
-attribute hal_drm_client;
-expandattribute hal_drm_client true;
-attribute hal_drm_server;
-expandattribute hal_drm_server false;
-
-attribute hal_cas;
-attribute hal_cas_client;
-expandattribute hal_cas_client true;
-attribute hal_cas_server;
-expandattribute hal_cas_server false;
-
# HALs
hal_attribute(allocator);
+hal_attribute(audio);
hal_attribute(audiocontrol);
hal_attribute(authsecret);
hal_attribute(bluetooth);
+hal_attribute(bootctl);
hal_attribute(broadcastradio);
+hal_attribute(camera);
+hal_attribute(cas);
hal_attribute(configstore);
hal_attribute(confirmationui);
hal_attribute(contexthub);
+hal_attribute(drm);
hal_attribute(dumpstate);
hal_attribute(evs);
hal_attribute(fingerprint);