Move bcinfo headers next to library
Move the bcinfo headers into bcinfo/include, and export the headers
to modules that depend on libbcinfo.
Test: m -j native
Change-Id: If50c88424055a754f5626201d8f05a9c404f24b9
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp
index 2f788db..a184edd 100644
--- a/bcinfo/Android.bp
+++ b/bcinfo/Android.bp
@@ -42,8 +42,10 @@
},
},
+ header_libs: ["libbcinfo-headers"],
+ export_header_lib_headers: ["libbcinfo-headers"],
+
include_dirs: [
- "frameworks/compile/libbcc/include",
"frameworks/rs",
"frameworks/compile/slang",
],
@@ -105,6 +107,17 @@
},
}
+cc_library_headers {
+ name: "libbcinfo-headers",
+ host_supported: true,
+ export_include_dirs: ["include"],
+ target: {
+ windows: {
+ enabled: true,
+ },
+ },
+}
+
subdirs = [
"BitReader_2_7",
"BitReader_3_0",
diff --git a/bcinfo/Wrap/Android.bp b/bcinfo/Wrap/Android.bp
index fc35623..bca5cb3 100644
--- a/bcinfo/Wrap/Android.bp
+++ b/bcinfo/Wrap/Android.bp
@@ -35,5 +35,5 @@
},
},
- include_dirs: ["frameworks/compile/libbcc/include"],
+ header_libs: ["libbcinfo-headers"],
}
diff --git a/include/bcinfo/BitcodeTranslator.h b/bcinfo/include/bcinfo/BitcodeTranslator.h
similarity index 100%
rename from include/bcinfo/BitcodeTranslator.h
rename to bcinfo/include/bcinfo/BitcodeTranslator.h
diff --git a/include/bcinfo/BitcodeWrapper.h b/bcinfo/include/bcinfo/BitcodeWrapper.h
similarity index 100%
rename from include/bcinfo/BitcodeWrapper.h
rename to bcinfo/include/bcinfo/BitcodeWrapper.h
diff --git a/include/bcinfo/MetadataExtractor.h b/bcinfo/include/bcinfo/MetadataExtractor.h
similarity index 100%
rename from include/bcinfo/MetadataExtractor.h
rename to bcinfo/include/bcinfo/MetadataExtractor.h
diff --git a/include/bcinfo/Wrap/BCHeaderField.h b/bcinfo/include/bcinfo/Wrap/BCHeaderField.h
similarity index 100%
rename from include/bcinfo/Wrap/BCHeaderField.h
rename to bcinfo/include/bcinfo/Wrap/BCHeaderField.h
diff --git a/include/bcinfo/Wrap/bitcode_wrapperer.h b/bcinfo/include/bcinfo/Wrap/bitcode_wrapperer.h
similarity index 100%
rename from include/bcinfo/Wrap/bitcode_wrapperer.h
rename to bcinfo/include/bcinfo/Wrap/bitcode_wrapperer.h
diff --git a/include/bcinfo/Wrap/file_wrapper_input.h b/bcinfo/include/bcinfo/Wrap/file_wrapper_input.h
similarity index 100%
rename from include/bcinfo/Wrap/file_wrapper_input.h
rename to bcinfo/include/bcinfo/Wrap/file_wrapper_input.h
diff --git a/include/bcinfo/Wrap/file_wrapper_output.h b/bcinfo/include/bcinfo/Wrap/file_wrapper_output.h
similarity index 100%
rename from include/bcinfo/Wrap/file_wrapper_output.h
rename to bcinfo/include/bcinfo/Wrap/file_wrapper_output.h
diff --git a/include/bcinfo/Wrap/in_memory_wrapper_input.h b/bcinfo/include/bcinfo/Wrap/in_memory_wrapper_input.h
similarity index 100%
rename from include/bcinfo/Wrap/in_memory_wrapper_input.h
rename to bcinfo/include/bcinfo/Wrap/in_memory_wrapper_input.h
diff --git a/include/bcinfo/Wrap/support_macros.h b/bcinfo/include/bcinfo/Wrap/support_macros.h
similarity index 100%
rename from include/bcinfo/Wrap/support_macros.h
rename to bcinfo/include/bcinfo/Wrap/support_macros.h
diff --git a/include/bcinfo/Wrap/wrapper_input.h b/bcinfo/include/bcinfo/Wrap/wrapper_input.h
similarity index 100%
rename from include/bcinfo/Wrap/wrapper_input.h
rename to bcinfo/include/bcinfo/Wrap/wrapper_input.h
diff --git a/include/bcinfo/Wrap/wrapper_output.h b/bcinfo/include/bcinfo/Wrap/wrapper_output.h
similarity index 100%
rename from include/bcinfo/Wrap/wrapper_output.h
rename to bcinfo/include/bcinfo/Wrap/wrapper_output.h
diff --git a/lib/Core/Android.bp b/lib/Core/Android.bp
index 43e9bcb..e96e461 100644
--- a/lib/Core/Android.bp
+++ b/lib/Core/Android.bp
@@ -28,6 +28,8 @@
"Source.cpp",
],
+ shared_libs: ["libbcinfo"],
+
target: {
windows: {
enabled: true,
diff --git a/lib/Renderscript/Android.bp b/lib/Renderscript/Android.bp
index d8fddc1..300e8b3 100644
--- a/lib/Renderscript/Android.bp
+++ b/lib/Renderscript/Android.bp
@@ -37,6 +37,8 @@
"RSX86TranslateGEPPass.cpp",
],
+ shared_libs: ["libbcinfo"],
+
target: {
windows: {
enabled: true,
