commit d8afe483117a3704037d6767f11859ea035e16d6
author Jiyong Park <jiyong@google.com> Wed Nov 14 03:57:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 14 03:57:28 2018 +0000
tree 340878e2092c566f154a70f605f052df08e2a047
parent a0fd81b4ceeee9a946aa1c7ec033e659a556988b
parent 1d3b2e786cb0e1b26d9d7d9426ac307da0d6fe94

Merge "Rename media apex to com.android.media"

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 7d1cfe2..bb73ead 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 apex {
-    name: "apex.media",
+    name: "com.android.media",
     manifest: "manifest.json",
     native_shared_libs: [
         // Extractor plugins
@@ -30,11 +30,11 @@
         // MediaPlayer2
         "libmedia2_jni",
     ],
-    key: "apex.media.key",
+    key: "com.android.media.key",
 }
 
 apex_key {
-    name: "apex.media.key",
+    name: "com.android.media.key",
     public_key: "media.avbpubkey",
     private_key: "media.pem",
 }

apex/file_contexts

diff --git a/apex/file_contexts b/apex/file_contexts
deleted file mode 100644
index 7dd840b..0000000
--- a/apex/file_contexts
+++ /dev/null
@@ -1,3 +0,0 @@
-(/.*)?                u:object_r:system_file:s0
-/manifest\.json   u:object_r:system_file:s0
-/lib(64)?(/.*)  u:object_r:system_lib_file:s0