diff options
| author | Jiyong Park <jiyong@google.com> | 2018-04-09 12:16:30 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-04-18 11:46:51 +0900 |
| commit | fe0a824a8aa85c21a087f0014e77f1ac3c8ae952 (patch) | |
| tree | 926fc4b12dc4f1d20ef633ad69c7e2c3dafb9a4b /libs | |
| parent | dce2457fd95b0652dd93cebdd73ce5ac512b914d (diff) | |
| download | native-fe0a824a8aa85c21a087f0014e77f1ac3c8ae952.tar.gz | |
Mark some libs as double_loadable
Following libs are explicitly marked as double_loadable since they are
one of the (indirect) dependencies of LLNDK libraries and at the same
time they themselves are marked as VNDK. Such lib can be double loaded
inside a vendor process.
* libgui and libbinder: due to indirect dependency from libmediandk via
libmediaomx. libmediandk is LLNDK)
* libui: due to dependency from libnativewindow, which is LLNDK.
Note: even without this change, the library is already capable of being
double loaded due to the dependency chain towards it. This change is to
make it explicit so that double loading of a library is carefully
tracked and signed-off by the owner of the lib.
Bug: 77155589
Test: m -j
Merged-In: Id4768162aeb72b71d63d7e4498980f276ef58e6b
Change-Id: Id4768162aeb72b71d63d7e4498980f276ef58e6b
(cherry picked from commit a75d3d6d9f2aef4b1855e6a58332859f3531143d)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/gui/Android.bp | 1 | ||||
| -rw-r--r-- | libs/ui/Android.bp | 1 | ||||
| -rw-r--r-- | libs/vr/libpdx/Android.bp | 10 |
4 files changed, 11 insertions, 2 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 57c87756ed..d4db8c81b4 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -36,6 +36,7 @@ cc_library { vndk: { enabled: true, }, + double_loadable: true, srcs: [ "AppOpsManager.cpp", diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index a302f28c41..02d29a3e69 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -23,6 +23,7 @@ cc_library_shared { vndk: { enabled: true, }, + double_loadable: true, clang: true, cflags: [ diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index dac9616752..438fd2a0f7 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -18,6 +18,7 @@ cc_library_shared { vndk: { enabled: true, }, + double_loadable: true, clang: true, cflags: [ diff --git a/libs/vr/libpdx/Android.bp b/libs/vr/libpdx/Android.bp index 10c0b31c57..113074b1b9 100644 --- a/libs/vr/libpdx/Android.bp +++ b/libs/vr/libpdx/Android.bp @@ -1,3 +1,9 @@ +cc_library_headers { + name: "libpdx_headers", + export_include_dirs: ["private"], + vendor_available: true, +} + cc_library_static { name: "libpdx", clang: true, @@ -8,8 +14,8 @@ cc_library_static { "-DLOG_TAG=\"libpdx\"", "-DTRACE=0", ], - export_include_dirs: ["private"], - local_include_dirs: ["private"], + header_libs: ["libpdx_headers"], + export_header_lib_headers: ["libpdx_headers"], srcs: [ "client.cpp", "service.cpp", |