diff options
| author | Tao Bao <tbao@google.com> | 2019-09-27 01:25:06 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-27 01:25:06 +0200 |
| commit | 86a39318cbb6a9f84b9afee0072be7ec2a86b8a7 (patch) | |
| tree | 2fa17f82041bb368389eec8b488e7304d5661ebc | |
| parent | Merge "Use libcrypto_static instead of libcrypto" am: 4c4c7dc26b am: 617d01a9c1 (diff) | |
| parent | Merge "minadbd: Export minadbd/types.h to libinstall." am: ffa9ffbd2b (diff) | |
| download | android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.tar android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.tar.gz android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.tar.bz2 android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.tar.lz android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.tar.xz android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.tar.zst android_bootable_recovery-86a39318cbb6a9f84b9afee0072be7ec2a86b8a7.zip | |
| -rw-r--r-- | install/Android.bp | 8 | ||||
| -rw-r--r-- | install/adb_install.cpp | 2 | ||||
| -rw-r--r-- | minadbd/Android.bp | 11 | ||||
| -rw-r--r-- | minadbd/include/minadbd/types.h (renamed from minadbd/minadbd_types.h) | 0 | ||||
| -rw-r--r-- | minadbd/minadbd.cpp | 2 | ||||
| -rw-r--r-- | minadbd/minadbd_services.cpp | 2 | ||||
| -rw-r--r-- | minadbd/minadbd_services_test.cpp | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/install/Android.bp b/install/Android.bp index 89cc3f23e..78c3a5784 100644 --- a/install/Android.bp +++ b/install/Android.bp @@ -19,10 +19,6 @@ cc_defaults { "recovery_defaults", ], - header_libs: [ - "libminadbd_headers", - ], - shared_libs: [ "libbase", "libbootloader_message", @@ -69,6 +65,10 @@ cc_library_static { "wipe_device.cpp", ], + header_libs: [ + "libminadbd_headers", + ], + shared_libs: [ "librecovery_ui", ], diff --git a/install/adb_install.cpp b/install/adb_install.cpp index ed664429a..ee79a32c0 100644 --- a/install/adb_install.cpp +++ b/install/adb_install.cpp @@ -44,7 +44,7 @@ #include "fuse_sideload.h" #include "install/install.h" #include "install/wipe_data.h" -#include "minadbd_types.h" +#include "minadbd/types.h" #include "otautil/sysutil.h" #include "recovery_ui/device.h" #include "recovery_ui/ui.h" diff --git a/minadbd/Android.bp b/minadbd/Android.bp index 805d12af3..071712599 100644 --- a/minadbd/Android.bp +++ b/minadbd/Android.bp @@ -26,6 +26,10 @@ cc_defaults { include_dirs: [ "system/core/adb", ], + + header_libs: [ + "libminadbd_headers", + ], } // `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing @@ -58,9 +62,12 @@ cc_library { cc_library_headers { name: "libminadbd_headers", recovery_available: true, - // TODO create a include dir export_include_dirs: [ - ".", + "include", + ], + // adb_install.cpp + visibility: [ + "//bootable/recovery/install", ], } diff --git a/minadbd/minadbd_types.h b/minadbd/include/minadbd/types.h index 002523f1f..002523f1f 100644 --- a/minadbd/minadbd_types.h +++ b/minadbd/include/minadbd/types.h diff --git a/minadbd/minadbd.cpp b/minadbd/minadbd.cpp index c80d5490a..7b82faa05 100644 --- a/minadbd/minadbd.cpp +++ b/minadbd/minadbd.cpp @@ -28,8 +28,8 @@ #include "adb_auth.h" #include "transport.h" +#include "minadbd/types.h" #include "minadbd_services.h" -#include "minadbd_types.h" using namespace std::string_literals; diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index c31afbe06..cabcdaa09 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp @@ -43,7 +43,7 @@ #include "adb_utils.h" #include "fuse_adb_provider.h" #include "fuse_sideload.h" -#include "minadbd_types.h" +#include "minadbd/types.h" #include "services.h" #include "sysdeps.h" diff --git a/minadbd/minadbd_services_test.cpp b/minadbd/minadbd_services_test.cpp index f87873792..b694a57d1 100644 --- a/minadbd/minadbd_services_test.cpp +++ b/minadbd/minadbd_services_test.cpp @@ -35,8 +35,8 @@ #include "adb_io.h" #include "fuse_adb_provider.h" #include "fuse_sideload.h" +#include "minadbd/types.h" #include "minadbd_services.h" -#include "minadbd_types.h" #include "socket.h" class MinadbdServicesTest : public ::testing::Test { |