commit 44574860b8dd1ada87b6e7e50d20a1c9e610316a
author Ray Essick <essick@google.com> Thu Feb 13 12:39:14 2020 -0800
committer Ray Essick <essick@google.com> Tue Feb 25 19:57:25 2020 +0000
tree b140b18273d0fecbddd21ecdfac9a4473af47890
parent 590a4e630d7a807f5e0ba4ff8532257fef0ed1f4

include policy files within media APEX files

ensures that the @include'd policy files (code_coverage, crash_dump)
used by mainlined media processes are carried within the respective
APEX files. Parent policy files now @include the copy held within
the apex.

Bug: 147914640
Test: built/booted/examined filesystem
Change-Id: I34213fbc93ca51696b6a5a3c60bfd3ffa7ce6764

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 73dc264..140a2e8 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -35,6 +35,8 @@
     },
     prebuilts: [
         "mediaextractor.policy",
+        "code_coverage.policy",
+        "crash_dump.policy",
     ],
     key: "com.android.media.key",
     certificate: ":com.android.media.certificate",
@@ -70,6 +72,8 @@
         "com.android.media.swcodec-mediaswcodec.rc",
         "com.android.media.swcodec-ld.config.txt",
         "mediaswcodec.policy",
+        "code_coverage.policy",
+        "crash_dump.policy",
         "mediaswcodec.xml",
     ],
     use_vendor: true,