Remove Export_static_lib_headers from codegen
It is not necessary to export headers from static libraries included
using whole_static_libs as that automatically exports the headers.
Test: m checkbuild
Bug: 134379140
Change-Id: Iea85dedf91f404739d12b3a7971cd87c02e1ab6d
Exempt-From-Owner-Approval: needed to fix build failure
diff --git a/build/codegen.go b/build/codegen.go
index aa942a7..f407e5d 100644
--- a/build/codegen.go
+++ b/build/codegen.go
@@ -114,8 +114,7 @@
type CodegenLibraryArchProperties struct {
Static struct {
- Whole_static_libs []string
- Export_static_lib_headers []string
+ Whole_static_libs []string
}
Shared struct {
Shared_libs []string
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 7005a89..59875a5 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -221,10 +221,6 @@
whole_static_libs: [
"libvixl",
],
- // Export vixl headers as they are included in this library's exported headers.
- export_static_lib_headers: [
- "libvixl",
- ],
},
shared: {
shared_libs: [
@@ -242,10 +238,6 @@
whole_static_libs: [
"libvixl",
],
- // Export vixl headers as they are included in this library's exported headers.
- export_static_lib_headers: [
- "libvixl",
- ],
},
shared: {
shared_libs: [
@@ -301,10 +293,6 @@
whole_static_libs: [
"libvixld",
],
- // Export vixl headers as they are included in this library's exported headers.
- export_static_lib_headers: [
- "libvixld",
- ],
},
shared: {
shared_libs: [
@@ -322,10 +310,6 @@
whole_static_libs: [
"libvixld",
],
- // Export vixl headers as they are included in this library's exported headers.
- export_static_lib_headers: [
- "libvixld",
- ],
},
shared: {
shared_libs: [