resolve merge conflicts of afc0aa78f
to oc-dev-plus-aosp
am: 1e00517d71
Change-Id: Ic9c11a227c76aca0f0d91531a8bddcd59f5ed821
This commit is contained in:
commit
8477333939
1 changed files with 8 additions and 2 deletions
|
@ -17,8 +17,14 @@ cc_library_headers {
|
|||
vendor_available: true,
|
||||
host_supported: true,
|
||||
|
||||
header_libs: ["libsystem_headers",],
|
||||
export_header_lib_headers: ["libsystem_headers",],
|
||||
header_libs: [
|
||||
"libsystem_headers",
|
||||
"libcutils_headers"
|
||||
],
|
||||
export_header_lib_headers: [
|
||||
"libsystem_headers",
|
||||
"libcutils_headers"
|
||||
],
|
||||
export_include_dirs: ["include"],
|
||||
|
||||
target: {
|
||||
|
|
Loading…
Reference in a new issue