commit | 6b9b06d89fd0e01037d3138c71886f2c315ae9ee | [log] [tgz] |
---|---|---|
author | Vijay Venkatraman <vijaykv@google.com> | Sat Feb 04 03:20:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Feb 04 03:20:11 2017 +0000 |
tree | 5f1775a41324cfb203b6975ed0cc9e05e163dfb8 | |
parent | 840069646aa83712d6b9b62f5cd5843d3fb5a443 [diff] | |
parent | d8f9c94393b143b9b1fc344bacfd79dd3fca0d12 [diff] |
Moved header files from include/media_resource_manager to include/ am: 965cc1b6ef am: 08bb89bcc7 am: d8f9c94393 Change-Id: I207d27357e75b2445c1a62686027504e8a6715ed
diff --git a/media_resource_manager/arbitrator/MediaResourceArbitrator.h b/media_resource_manager/arbitrator/MediaResourceArbitrator.h index ac6380d..3e68a87 120000 --- a/media_resource_manager/arbitrator/MediaResourceArbitrator.h +++ b/media_resource_manager/arbitrator/MediaResourceArbitrator.h
@@ -1 +1 @@ -../include/media_resource_manager/MediaResourceArbitrator.h \ No newline at end of file +../include/MediaResourceArbitrator.h \ No newline at end of file
diff --git a/media_resource_manager/include/media_resource_manager/MediaResourceArbitrator.h b/media_resource_manager/include/MediaResourceArbitrator.h similarity index 100% rename from media_resource_manager/include/media_resource_manager/MediaResourceArbitrator.h rename to media_resource_manager/include/MediaResourceArbitrator.h
diff --git a/media_resource_manager/include/media_resource_manager/OMX_adaptor.h b/media_resource_manager/include/OMX_adaptor.h similarity index 100% rename from media_resource_manager/include/media_resource_manager/OMX_adaptor.h rename to media_resource_manager/include/OMX_adaptor.h
diff --git a/media_resource_manager/omx_adaptor/OMX_adaptor.h b/media_resource_manager/omx_adaptor/OMX_adaptor.h deleted file mode 120000 index 989467d..0000000 --- a/media_resource_manager/omx_adaptor/OMX_adaptor.h +++ /dev/null
@@ -1 +0,0 @@ -../include/media_resource_manager/OMX_adaptor.h \ No newline at end of file
diff --git a/media_resource_manager/include/media_resource_manager/OMX_adaptor.h b/media_resource_manager/omx_adaptor/OMX_adaptor.h similarity index 100% copy from media_resource_manager/include/media_resource_manager/OMX_adaptor.h copy to media_resource_manager/omx_adaptor/OMX_adaptor.h