diff options
| author | 2017-11-03 14:40:24 +0900 | |
|---|---|---|
| committer | 2017-11-06 10:07:15 +0900 | |
| commit | 259775cf8bd97feebc2c55d0331c7430b2eb086a (patch) | |
| tree | 9335eb6b132b43405bee2be1b6bde2cdff1745a2 | |
| parent | dc3cb6422406b59b1ca421289c589a394a599a3b (diff) | |
merge dumpstate_headers into libdumpstateutil
The header lib is used nowhere outside of this .bp.
Test: build with aosp_arm64_ab
Change-Id: I082e9bb7139051cb47b76e411f86d54ed89b6fbc
| -rw-r--r-- | cmds/dumpstate/Android.bp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp index f908cbfe28..ce3a6aad7a 100644 --- a/cmds/dumpstate/Android.bp +++ b/cmds/dumpstate/Android.bp @@ -24,20 +24,6 @@ cc_defaults { ], } -cc_library_headers { - name: "dumpstate_headers", - vendor_available: true, - export_include_dirs: ["."], - header_libs: [ - "libbase_headers", - "libutils_headers", - ], - export_header_lib_headers: [ - "libbase_headers", - "libutils_headers", - ], -} - cc_library_shared { name: "libdumpstateutil", defaults: ["dumpstate_defaults"], @@ -45,8 +31,6 @@ cc_library_shared { vndk: { enabled: true, }, - header_libs: ["dumpstate_headers"], - export_header_lib_headers: ["dumpstate_headers"], srcs: [ "DumpstateInternal.cpp", "DumpstateUtil.cpp", @@ -55,6 +39,10 @@ cc_library_shared { "libbase", "liblog", ], + export_include_dirs: ["."], + export_shared_lib_headers: [ + "libbase", + ], } cc_library_shared { @@ -78,7 +66,6 @@ cc_library_shared { cc_binary { name: "dumpstate", defaults: ["dumpstate_defaults"], - header_libs: ["dumpstate_headers"], shared_libs: [ "android.hardware.dumpstate@1.0", "libziparchive", @@ -106,7 +93,6 @@ cc_binary { cc_test { name: "dumpstate_test", defaults: ["dumpstate_defaults"], - header_libs: ["dumpstate_headers"], shared_libs: [ "libziparchive", "libbase", |