commit ddf8d7b3f0e04fe3709a97bac82959e53b83b399
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Dec 18 23:43:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 18 23:43:25 2017 +0000
tree 8311b79c79ba6ef6bf09b9b1fb98275dc53ae468
parent d50afbdb4a55eea5c91d3591421c463ae8300b72
parent 9c353be047dc8e17b43378018bcb37bb1b6def00

Merge changes from topic "omx-dtd"

* changes:
  Move media configuration to its own directory.
  Add Android.mk back for media profile.

media/1.0/xml/Android.mk

diff --git a/media/1.0/xml/Android.mk b/media/1.0/xml/Android.mk
new file mode 100644
index 0000000..bc44b9e
--- /dev/null
+++ b/media/1.0/xml/Android.mk
@@ -0,0 +1,14 @@
+LOCAL_PATH := $(call my-dir)
+
+#######################################
+# media_profiles_V1_0.dtd
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := media_profiles_V1_0.dtd
+LOCAL_SRC_FILES := media_profiles.dtd
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+
+include $(BUILD_PREBUILT)
+

media/1.0/xml/media_profiles.dtd

diff --git a/media/1.0/media_profiles.dtd b/media/1.0/xml/media_profiles.dtd
similarity index 100%
rename from media/1.0/media_profiles.dtd
rename to media/1.0/xml/media_profiles.dtd