gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove symlinks from include dir"

Browse Source
gugelfrei
Marco Nelissen 5 years ago committed by Android (Google) Code Review
parent 3b93ca583a cf90b49317
commit 824cb8f898
82 changed files with 16 additions and 79 deletions
Show Stats Download Patch File Download Diff File

1
cmds/stagefright/Android.mk
Unescape View File

@ -39,6 +39,7 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright_foundation
LOCAL_C_INCLUDES:= \
frameworks/av/camera/include \
frameworks/av/media/libstagefright \
frameworks/native/include/media/openmax \
frameworks/native/include/media/hardware

1
include/camera
Unescape View File

@ -1 +0,0 @@
../camera/include/camera/

1
include/cpustats
Unescape View File

@ -1 +0,0 @@
../media/libcpustats/include/cpustats/

1
include/media/AVSyncSettings.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/AVSyncSettings.h

1
include/media/AudioBufferProvider.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/AudioBufferProvider.h

1
include/media/AudioClient.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/AudioClient.h

1
include/media/AudioEffect.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/AudioEffect.h

1
include/media/AudioMixer.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioprocessing/include/media/AudioMixer.h

1
include/media/AudioRecord.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/AudioRecord.h

1
include/media/AudioResampler.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioprocessing/include/media/AudioResampler.h

1
include/media/AudioTrack.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/AudioTrack.h

1
include/media/BufferProviders.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioprocessing/include/media/BufferProviders.h

1
include/media/BufferingSettings.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/BufferingSettings.h

1
include/media/CharacterEncodingDetector.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/CharacterEncodingDetector.h

1
include/media/EventLog.h
Unescape View File

@ -1 +0,0 @@
../../media/utils/include/mediautils/EventLog.h

1
include/media/ExtendedAudioBufferProvider.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/ExtendedAudioBufferProvider.h

1
include/media/IAudioFlinger.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/IAudioFlinger.h

1
include/media/IAudioPolicyService.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/IAudioPolicyService.h

1
include/media/IAudioTrack.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/IAudioTrack.h

1
include/media/IEffect.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/IEffect.h

1
include/media/IEffectClient.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/IEffectClient.h

1
include/media/IMediaCodecList.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaCodecList.h

1
include/media/IMediaDeathNotifier.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaDeathNotifier.h

1
include/media/IMediaExtractor.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaExtractor.h

1
include/media/IMediaExtractorService.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaExtractorService.h

1
include/media/IMediaHTTPConnection.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaHTTPConnection.h

1
include/media/IMediaHTTPService.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaHTTPService.h

1
include/media/IMediaMetadataRetriever.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaMetadataRetriever.h

1
include/media/IMediaPlayer.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaPlayer.h

1
include/media/IMediaPlayerService.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaPlayerService.h

1
include/media/IMediaRecorder.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaRecorder.h

1
include/media/IMediaSource.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IMediaSource.h

1
include/media/IOMX.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IOMX.h

1
include/media/IRemoteDisplay.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IRemoteDisplay.h

1
include/media/IRemoteDisplayClient.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IRemoteDisplayClient.h

1
include/media/IResourceManagerClient.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IResourceManagerClient.h

1
include/media/IResourceManagerService.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IResourceManagerService.h

1
include/media/IStreamSource.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/IStreamSource.h

1
include/media/JetPlayer.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/JetPlayer.h

1
include/media/LinearMap.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/LinearMap.h

1
include/media/MediaCodecBuffer.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaCodecBuffer.h

1
include/media/MediaCodecInfo.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaCodecInfo.h

1
include/media/MediaMetadataRetrieverInterface.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaMetadataRetrieverInterface.h

1
include/media/MediaProfiles.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaProfiles.h

1
include/media/MediaRecorderBase.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaRecorderBase.h

1
include/media/MediaResource.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaResource.h

1
include/media/MediaResourcePolicy.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MediaResourcePolicy.h

1
include/media/MidiDeviceInfo.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/MidiDeviceInfo.h

1
include/media/OMXBuffer.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/OMXBuffer.h

1
include/media/OMXFenceParcelable.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/OMXFenceParcelable.h

1
include/media/PluginLoader.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/PluginLoader.h

1
include/media/RecordBufferConverter.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/RecordBufferConverter.h

1
include/media/StringArray.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/StringArray.h

1
include/media/TimeCheck.h
Unescape View File

@ -1 +0,0 @@
../../media/utils/include/mediautils/TimeCheck.h

1
include/media/ToneGenerator.h
Unescape View File

@ -1 +0,0 @@
../../media/libaudioclient/include/media/ToneGenerator.h

1
include/media/TypeConverter.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/TypeConverter.h

1
include/media/Visualizer.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/Visualizer.h

1
include/media/convert.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/convert.h

1
include/media/mediametadataretriever.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/mediametadataretriever.h

1
include/media/mediaplayer.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/mediaplayer.h

1
include/media/mediarecorder.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/mediarecorder.h

1
include/media/mediascanner.h
Unescape View File

@ -1 +0,0 @@
../../media/libmedia/include/media/mediascanner.h

1
include/media/nbaio/AudioBufferProviderSource.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/AudioBufferProviderSource.h

1
include/media/nbaio/AudioStreamInSource.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/AudioStreamInSource.h

1
include/media/nbaio/LibsndfileSink.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/LibsndfileSink.h

1
include/media/nbaio/LibsndfileSource.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/LibsndfileSource.h

1
include/media/nbaio/MonoPipe.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include_mono/media/nbaio/MonoPipe.h

1
include/media/nbaio/MonoPipeReader.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include_mono/media/nbaio/MonoPipeReader.h

1
include/media/nbaio/Pipe.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/Pipe.h

1
include/media/nbaio/PipeReader.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/PipeReader.h

1
include/media/nbaio/SourceAudioBufferProvider.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnbaio/include/media/nbaio/SourceAudioBufferProvider.h

1
include/media/nblog/NBLog.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnblog/include/media/nblog/NBLog.h

1
include/media/nblog/PerformanceAnalysis.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnblog/include/media/nblog/PerformanceAnalysis.h

1
include/media/nblog/ReportPerformance.h
Unescape View File

@ -1 +0,0 @@
../../../media/libnblog/include/media/nblog/ReportPerformance.h

2
media/libaudioclient/IAudioFlinger.cpp
Unescape View File

@ -24,8 +24,8 @@
#include <binder/IPCThreadState.h>
#include <binder/Parcel.h>
#include <media/TimeCheck.h>
#include <mediautils/ServiceUtilities.h>
#include <mediautils/TimeCheck.h>
#include "IAudioFlinger.h"
namespace android {

2
media/libaudioclient/IAudioPolicyService.cpp
Unescape View File

@ -26,8 +26,8 @@
#include <binder/Parcel.h>
#include <media/AudioEffect.h>
#include <media/IAudioPolicyService.h>
#include <media/TimeCheck.h>
#include <mediautils/ServiceUtilities.h>
#include <mediautils/TimeCheck.h>
#include <system/audio.h>
namespace android {

0
media/libmedia/include/media/RecordBufferConverter.h → media/libaudioprocessing/include/media/RecordBufferConverter.h
Unescape View File

1
media/libaudioprocessing/tests/Android.bp
Unescape View File

@ -5,6 +5,7 @@ cc_defaults {
header_libs: ["libbase_headers"],
shared_libs: [
"libaudioclient",
"libaudioprocessing",
"libaudioutils",
"libcutils",

8
media/libcpustats/Android.bp
Unescape View File

@ -6,6 +6,14 @@ cc_library_static {
"ThreadCpuUsage.cpp",
],
local_include_dirs: [
"include",
],
export_include_dirs: [
"include",
],
cflags: [
"-Werror",
"-Wall",

2
media/libmedia/Android.bp
Unescape View File

@ -73,7 +73,7 @@ cc_library_shared {
local_include_dirs: ["aidl"],
export_aidl_headers: true,
},
local_include_dirs: [
"include",
],

4
media/utils/TimeCheck.cpp
Unescape View File

@ -16,8 +16,8 @@
#include <utils/Log.h>
#include <media/TimeCheck.h>
#include <media/EventLog.h>
#include <mediautils/TimeCheck.h>
#include <mediautils/EventLog.h>
namespace android {

2
services/mediaanalytics/Android.bp
Unescape View File

@ -50,7 +50,7 @@ cc_binary {
"frameworks/av/media/libstagefright/rtsp",
"frameworks/av/media/libstagefright/webm",
"frameworks/av/include/media",
"frameworks/av/include/camera",
"frameworks/av/camera/include/camera",
"frameworks/native/include/media/openmax",
"frameworks/native/include/media/hardware",
"external/tremolo/Tremolo",

Write Preview
Loading…
Cancel
Save