Replace raw include paths with header_libs
Replace the use of raw include paths involving media extractors with
header_libs and export_include_dirs.
Bug: 201944263
Test: build
Change-Id: If1d43fbdcc756af0c1943739ec83d482af46095e
diff --git a/media/extractors/Android.bp b/media/extractors/Android.bp
index 7513cb1..66585da 100644
--- a/media/extractors/Android.bp
+++ b/media/extractors/Android.bp
@@ -24,10 +24,6 @@
cc_defaults {
name: "extractor-defaults",
- include_dirs: [
- "frameworks/av/media/libstagefright/include",
- ],
-
shared_libs: [
"liblog",
],
diff --git a/media/extractors/aac/Android.bp b/media/extractors/aac/Android.bp
index 7bf3a13..a926422 100644
--- a/media/extractors/aac/Android.bp
+++ b/media/extractors/aac/Android.bp
@@ -21,6 +21,10 @@
srcs: ["AACExtractor.cpp"],
+ export_include_dirs: [
+ "include",
+ ],
+
static_libs: [
"libstagefright_foundation",
"libstagefright_metadatautils",
diff --git a/media/extractors/aac/AACExtractor.h b/media/extractors/aac/include/AACExtractor.h
similarity index 100%
rename from media/extractors/aac/AACExtractor.h
rename to media/extractors/aac/include/AACExtractor.h
diff --git a/media/extractors/amr/Android.bp b/media/extractors/amr/Android.bp
index 712360d..121b7a3 100644
--- a/media/extractors/amr/Android.bp
+++ b/media/extractors/amr/Android.bp
@@ -21,6 +21,10 @@
srcs: ["AMRExtractor.cpp"],
+ export_include_dirs: [
+ "include",
+ ],
+
static_libs: [
"libstagefright_foundation",
],
diff --git a/media/extractors/amr/AMRExtractor.h b/media/extractors/amr/include/AMRExtractor.h
similarity index 100%
rename from media/extractors/amr/AMRExtractor.h
rename to media/extractors/amr/include/AMRExtractor.h
diff --git a/media/extractors/flac/Android.bp b/media/extractors/flac/Android.bp
index 9a2a76b..fd51622 100644
--- a/media/extractors/flac/Android.bp
+++ b/media/extractors/flac/Android.bp
@@ -23,8 +23,8 @@
srcs: ["FLACExtractor.cpp"],
- include_dirs: [
- "external/flac/include",
+ export_include_dirs: [
+ "include",
],
shared_libs: [
diff --git a/media/extractors/flac/FLACExtractor.h b/media/extractors/flac/include/FLACExtractor.h
similarity index 100%
rename from media/extractors/flac/FLACExtractor.h
rename to media/extractors/flac/include/FLACExtractor.h
diff --git a/media/extractors/fuzzers/Android.bp b/media/extractors/fuzzers/Android.bp
index 0e54b58..490e195 100644
--- a/media/extractors/fuzzers/Android.bp
+++ b/media/extractors/fuzzers/Android.bp
@@ -80,11 +80,6 @@
defaults: ["extractor-fuzzer-defaults"],
host_supported: true,
- include_dirs: [
- "frameworks/av/media/extractors/mpeg2",
- "frameworks/av/media/libstagefright",
- ],
-
static_libs: [
"libstagefright_foundation_without_imemory",
"libstagefright_mpeg2support",
@@ -124,14 +119,6 @@
"mp4_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/mp4",
- ],
-
- header_libs: [
- "libaudioclient_headers",
- ],
-
static_libs: [
"libstagefright_id3",
"libstagefright_esds",
@@ -150,10 +137,6 @@
"wav_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/wav",
- ],
-
static_libs: [
"libfifo",
"libwavextractor",
@@ -173,10 +156,6 @@
"amr_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/amr",
- ],
-
static_libs: [
"libamrextractor",
],
@@ -193,10 +172,6 @@
"mkv_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/mkv",
- ],
-
static_libs: [
"libwebm",
"libstagefright_flacdec",
@@ -217,9 +192,6 @@
"ogg_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/ogg",
- ],
static_libs: [
"libstagefright_metadatautils",
@@ -265,10 +237,6 @@
"mp3_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/mp3",
- ],
-
static_libs: [
"libfifo",
"libmp3extractor",
@@ -285,10 +253,6 @@
"aac_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/aac",
- ],
-
static_libs: [
"libaacextractor",
"libstagefright_metadatautils",
@@ -304,10 +268,6 @@
"flac_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/flac",
- ],
-
static_libs: [
"libstagefright_metadatautils",
"libFLAC",
@@ -329,10 +289,6 @@
"midi_extractor_fuzzer.cpp",
],
- include_dirs: [
- "frameworks/av/media/extractors/midi",
- ],
-
static_libs: [
"libsonivox",
"libmedia_midiiowrapper",
diff --git a/media/extractors/midi/Android.bp b/media/extractors/midi/Android.bp
index 08a6fa0..feabf9e 100644
--- a/media/extractors/midi/Android.bp
+++ b/media/extractors/midi/Android.bp
@@ -23,6 +23,10 @@
srcs: ["MidiExtractor.cpp"],
+ export_include_dirs: [
+ "include",
+ ],
+
header_libs: [
"libmedia_datasource_headers",
],
diff --git a/media/extractors/midi/MidiExtractor.h b/media/extractors/midi/include/MidiExtractor.h
similarity index 100%
rename from media/extractors/midi/MidiExtractor.h
rename to media/extractors/midi/include/MidiExtractor.h
diff --git a/media/extractors/mkv/Android.bp b/media/extractors/mkv/Android.bp
index 54c5b27..98ce305 100644
--- a/media/extractors/mkv/Android.bp
+++ b/media/extractors/mkv/Android.bp
@@ -21,10 +21,8 @@
srcs: ["MatroskaExtractor.cpp"],
- include_dirs: [
- "external/flac/include",
- "external/libvpx/libwebm",
- "frameworks/av/media/libstagefright/flac/dec",
+ export_include_dirs: [
+ "include",
],
shared_libs: [
diff --git a/media/extractors/mkv/MatroskaExtractor.h b/media/extractors/mkv/include/MatroskaExtractor.h
similarity index 100%
rename from media/extractors/mkv/MatroskaExtractor.h
rename to media/extractors/mkv/include/MatroskaExtractor.h
diff --git a/media/extractors/mp3/Android.bp b/media/extractors/mp3/Android.bp
index 75b9b7b..396a13a 100644
--- a/media/extractors/mp3/Android.bp
+++ b/media/extractors/mp3/Android.bp
@@ -16,6 +16,10 @@
"XINGSeeker.cpp",
],
+ export_include_dirs: [
+ "include",
+ ],
+
static_libs: [
"libutils",
"libstagefright_id3",
diff --git a/media/extractors/mp3/MP3Extractor.h b/media/extractors/mp3/include/MP3Extractor.h
similarity index 100%
rename from media/extractors/mp3/MP3Extractor.h
rename to media/extractors/mp3/include/MP3Extractor.h
diff --git a/media/extractors/mp3/MP3Seeker.h b/media/extractors/mp3/include/MP3Seeker.h
similarity index 100%
rename from media/extractors/mp3/MP3Seeker.h
rename to media/extractors/mp3/include/MP3Seeker.h
diff --git a/media/extractors/mp3/VBRISeeker.h b/media/extractors/mp3/include/VBRISeeker.h
similarity index 100%
rename from media/extractors/mp3/VBRISeeker.h
rename to media/extractors/mp3/include/VBRISeeker.h
diff --git a/media/extractors/mp3/XINGSeeker.h b/media/extractors/mp3/include/XINGSeeker.h
similarity index 100%
rename from media/extractors/mp3/XINGSeeker.h
rename to media/extractors/mp3/include/XINGSeeker.h
diff --git a/media/extractors/mp4/Android.bp b/media/extractors/mp4/Android.bp
index 7fa6bfd..540d75d 100644
--- a/media/extractors/mp4/Android.bp
+++ b/media/extractors/mp4/Android.bp
@@ -15,6 +15,15 @@
],
}
+cc_library_headers {
+ name: "libmp4extractor_headers",
+ host_supported: true,
+
+ export_include_dirs: [
+ "include",
+ ],
+}
+
cc_library {
name: "libmp4extractor",
defaults: ["extractor-defaults"],
@@ -27,6 +36,10 @@
"SampleTable.cpp",
],
+ export_include_dirs: [
+ "include",
+ ],
+
static_libs: [
"libstagefright_esds",
"libstagefright_foundation",
diff --git a/media/extractors/mp4/AC4Parser.h b/media/extractors/mp4/include/AC4Parser.h
similarity index 100%
rename from media/extractors/mp4/AC4Parser.h
rename to media/extractors/mp4/include/AC4Parser.h
diff --git a/media/extractors/mp4/ItemTable.h b/media/extractors/mp4/include/ItemTable.h
similarity index 100%
rename from media/extractors/mp4/ItemTable.h
rename to media/extractors/mp4/include/ItemTable.h
diff --git a/media/extractors/mp4/MPEG4Extractor.h b/media/extractors/mp4/include/MPEG4Extractor.h
similarity index 100%
rename from media/extractors/mp4/MPEG4Extractor.h
rename to media/extractors/mp4/include/MPEG4Extractor.h
diff --git a/media/extractors/mp4/SampleIterator.h b/media/extractors/mp4/include/SampleIterator.h
similarity index 100%
rename from media/extractors/mp4/SampleIterator.h
rename to media/extractors/mp4/include/SampleIterator.h
diff --git a/media/extractors/mp4/SampleTable.h b/media/extractors/mp4/include/SampleTable.h
similarity index 100%
rename from media/extractors/mp4/SampleTable.h
rename to media/extractors/mp4/include/SampleTable.h
diff --git a/media/extractors/mpeg2/Android.bp b/media/extractors/mpeg2/Android.bp
index 7e6247b..8faecae 100644
--- a/media/extractors/mpeg2/Android.bp
+++ b/media/extractors/mpeg2/Android.bp
@@ -38,6 +38,10 @@
"MPEG2TSExtractor.cpp",
],
+ export_include_dirs: [
+ "include",
+ ],
+
shared_libs: [
"libbase",
"libcgrouprc#29",
diff --git a/media/extractors/mpeg2/MPEG2PSExtractor.h b/media/extractors/mpeg2/include/MPEG2PSExtractor.h
similarity index 100%
rename from media/extractors/mpeg2/MPEG2PSExtractor.h
rename to media/extractors/mpeg2/include/MPEG2PSExtractor.h
diff --git a/media/extractors/mpeg2/MPEG2TSExtractor.h b/media/extractors/mpeg2/include/MPEG2TSExtractor.h
similarity index 100%
rename from media/extractors/mpeg2/MPEG2TSExtractor.h
rename to media/extractors/mpeg2/include/MPEG2TSExtractor.h
diff --git a/media/extractors/ogg/Android.bp b/media/extractors/ogg/Android.bp
index d7540c4..dc3c25c 100644
--- a/media/extractors/ogg/Android.bp
+++ b/media/extractors/ogg/Android.bp
@@ -22,8 +22,8 @@
srcs: ["OggExtractor.cpp"],
- include_dirs: [
- "external/tremolo",
+ export_include_dirs: [
+ "include",
],
header_libs: [
diff --git a/media/extractors/ogg/OggExtractor.h b/media/extractors/ogg/include/OggExtractor.h
similarity index 100%
rename from media/extractors/ogg/OggExtractor.h
rename to media/extractors/ogg/include/OggExtractor.h
diff --git a/media/extractors/tests/Android.bp b/media/extractors/tests/Android.bp
index 23c74f7..3c3bbdc 100644
--- a/media/extractors/tests/Android.bp
+++ b/media/extractors/tests/Android.bp
@@ -79,11 +79,6 @@
"libbase",
],
- include_dirs: [
- "frameworks/av/media/extractors/",
- "frameworks/av/media/libstagefright/",
- ],
-
compile_multilib: "first",
cflags: [
diff --git a/media/extractors/tests/ExtractorUnitTest.cpp b/media/extractors/tests/ExtractorUnitTest.cpp
index 84ec1f2..2bd9c6a 100644
--- a/media/extractors/tests/ExtractorUnitTest.cpp
+++ b/media/extractors/tests/ExtractorUnitTest.cpp
@@ -27,18 +27,18 @@
#include <media/stagefright/MetaDataUtils.h>
#include <media/stagefright/foundation/OpusHeader.h>
-#include "aac/AACExtractor.h"
-#include "amr/AMRExtractor.h"
-#include "flac/FLACExtractor.h"
-#include "midi/MidiExtractor.h"
-#include "mkv/MatroskaExtractor.h"
-#include "mp3/MP3Extractor.h"
-#include "mp4/MPEG4Extractor.h"
-#include "mp4/SampleTable.h"
-#include "mpeg2/MPEG2PSExtractor.h"
-#include "mpeg2/MPEG2TSExtractor.h"
-#include "ogg/OggExtractor.h"
-#include "wav/WAVExtractor.h"
+#include <AACExtractor.h>
+#include <AMRExtractor.h>
+#include <FLACExtractor.h>
+#include <MidiExtractor.h>
+#include <MatroskaExtractor.h>
+#include <MP3Extractor.h>
+#include <MPEG4Extractor.h>
+#include <SampleTable.h>
+#include <MPEG2PSExtractor.h>
+#include <MPEG2TSExtractor.h>
+#include <OggExtractor.h>
+#include <WAVExtractor.h>
#include "ExtractorUnitTestEnvironment.h"
diff --git a/media/extractors/wav/Android.bp b/media/extractors/wav/Android.bp
index cc5e1c7..b7e2af3 100644
--- a/media/extractors/wav/Android.bp
+++ b/media/extractors/wav/Android.bp
@@ -22,8 +22,8 @@
srcs: ["WAVExtractor.cpp"],
- include_dirs: [
- "frameworks/av/media/libstagefright/include",
+ export_include_dirs: [
+ "include",
],
shared_libs: [
diff --git a/media/extractors/wav/WAVExtractor.h b/media/extractors/wav/include/WAVExtractor.h
similarity index 100%
rename from media/extractors/wav/WAVExtractor.h
rename to media/extractors/wav/include/WAVExtractor.h
diff --git a/media/libstagefright/mpeg2ts/test/Android.bp b/media/libstagefright/mpeg2ts/test/Android.bp
index 464b039..34a8d3e 100644
--- a/media/libstagefright/mpeg2ts/test/Android.bp
+++ b/media/libstagefright/mpeg2ts/test/Android.bp
@@ -57,11 +57,6 @@
"libstagefright_mpeg2support",
],
- include_dirs: [
- "frameworks/av/media/extractors/",
- "frameworks/av/media/libstagefright/",
- ],
-
header_libs: [
"libmedia_headers",
"libaudioclient_headers",
diff --git a/media/libstagefright/mpeg2ts/test/Mpeg2tsUnitTest.cpp b/media/libstagefright/mpeg2ts/test/Mpeg2tsUnitTest.cpp
index 79c233b..7f25d78 100644
--- a/media/libstagefright/mpeg2ts/test/Mpeg2tsUnitTest.cpp
+++ b/media/libstagefright/mpeg2ts/test/Mpeg2tsUnitTest.cpp
@@ -27,8 +27,8 @@
#include <media/stagefright/MetaDataBase.h>
#include <media/stagefright/foundation/AUtils.h>
-#include "mpeg2ts/ATSParser.h"
-#include "mpeg2ts/AnotherPacketSource.h"
+#include <ATSParser.h>
+#include <AnotherPacketSource.h>
#include "Mpeg2tsUnitTestEnvironment.h"