commit 76a42078df80ef8448c70f53c59646df274851eb
author android-build-team Robot <android-build-team-robot@google.com> Tue Nov 05 12:35:33 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 05 12:35:33 2019 +0000
tree 7f7571a134d11528cf5afb70efd16a6b1cf77db8
parent 36a6886f1a6e2a3348271e87f784fa2011485524
parent 3e4f06d9f918c9ef5e65b56e04dc7f2f353b3a35

Snap for 5988121 from 3e4f06d9f918c9ef5e65b56e04dc7f2f353b3a35 to qt-aml-networking-release

Change-Id: I67eebee6449032ee181844db58d197655e7113d4

Android.bp

diff --git a/Android.bp b/Android.bp
index 4e3a009..375e36d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,9 +1,10 @@
-cc_library_static {
-    name: "libelf_headers",
+cc_library_headers {
+    name: "elfutils_headers",
     host_supported: true,
     vendor_available: true,
     export_include_dirs: [
         ".",
+        "include",
         "lib",
     ],
     target: {

libelf/Android.bp

diff --git a/libelf/Android.bp b/libelf/Android.bp
index c184e28..1c7e647 100644
--- a/libelf/Android.bp
+++ b/libelf/Android.bp
@@ -144,11 +144,11 @@
         "-Wno-pointer-arith",
     ],
 
-    static_libs: [
-        "libz",
-        "libelf_headers",
-    ],
+    static_libs: ["libz"],
 
+    header_libs: ["elfutils_headers"],
+
+    export_header_lib_headers: ["elfutils_headers"],
     export_include_dirs: ["."],
 
     target: {
@@ -168,7 +168,7 @@
 
     visibility: [
         "//device/google/contexthub/util/nanoapp_postprocess",
+        "//external/igt-gpu-tools",
         "//external/mesa3d",
-        "//external/perf_data_converter",
     ],
 }