From 284a18ae52678daa1134f140598e40531b1bd63f Mon Sep 17 00:00:00 2001
From: Tri Vo <trong@google.com>
Date: Wed, 31 Jan 2018 16:58:51 -0800
Subject: [PATCH] Temporary fix to avoid expandattribute value conflicts.

Bug: 69390067
Bug: 72757373
Test: build sepolicy
Change-Id: I44aeb547ff7ab7042eddfa780df8cbb7dcec71b4
---
 public/attributes | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/public/attributes b/public/attributes
index 6c6b129d1..0aec64561 100644
--- a/public/attributes
+++ b/public/attributes
@@ -203,19 +203,46 @@ attribute halserverdomain;
 attribute halclientdomain;
 expandattribute halclientdomain true;
 
+# 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(authsecret);
 hal_attribute(bluetooth);
-hal_attribute(bootctl);
 hal_attribute(broadcastradio);
-hal_attribute(camera);
 hal_attribute(configstore);
 hal_attribute(confirmationui);
 hal_attribute(contexthub);
-hal_attribute(drm);
-hal_attribute(cas);
 hal_attribute(dumpstate);
 hal_attribute(fingerprint);
 hal_attribute(gatekeeper);
-- 
GitLab