tree 7ec98224aa4ffca4265ef39ed582a89b567803be
parent 5a11cea812c4b35cf668623b6db7f491dfadb877
author Tri Vo <trong@android.com> 1521223896 -0700
committer Jeff Vander Stoep <jeffv@google.com> 1522184028 -0700

Resolve conflicts in expandattribute.

This commit resolves conflicts in values of expandattribute statements
in policy language and expandtypeattribute in CIL.

For example, these statements resolve to false in policy language:
 expandattribute hal_audio true;
 expandattribute hal_audio false;

Similarly, in CIL these also resolve to false.
 (expandtypeattribute (hal_audio) true)
 (expandtypeattribute (hal_audio) false)

A warning will be issued on this conflict.

Motivation
When Android combines multiple .cil files from system.img and vendor.img
it's possible to have conflicting expandattribute statements.

This change deals with this scenario by resolving the value of the
corresponding expandtypeattribute to false. The rationale behind this
override is that true is used for reduce run-time lookups, while
false is used for tests which must pass.

Signed-off-by: Tri Vo <trong@android.com>
Acked-by: Jeff Vander Stoep <jeffv@google.com>
Acked-by: William Roberts <william.c.roberts@intel.com>
Acked-by: James Carter <jwcart2@tycho.nsa.gov>

Bug: 72757373
Test: build and run aosp_taimen-userdebugaa
Change-Id: I4c9c36006db61c95da2c94eec33fb4d526b74243
(cherry picked from commit ea8d689b533ac498c8ab37bca04aaf4f81e2ee71)