diff options
Diffstat (limited to 'dynamic-layers/selinux/android-tools/android-tools/fastboot_compile_remove_gtest.patch')
-rw-r--r-- | dynamic-layers/selinux/android-tools/android-tools/fastboot_compile_remove_gtest.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/dynamic-layers/selinux/android-tools/android-tools/fastboot_compile_remove_gtest.patch b/dynamic-layers/selinux/android-tools/android-tools/fastboot_compile_remove_gtest.patch new file mode 100644 index 0000000..a04f27f --- /dev/null +++ b/dynamic-layers/selinux/android-tools/android-tools/fastboot_compile_remove_gtest.patch | |||
@@ -0,0 +1,51 @@ | |||
1 | socket.h: removing dependency of gtest | ||
2 | |||
3 | Removed the dependency of gtest on the build of fastboot binary. | ||
4 | Fixes below error | ||
5 | |||
6 | In file included from fastboot/fastboot.cpp:70: | ||
7 | | In file included from fastboot/tcp.h:36: | ||
8 | | fastboot/socket.h:43:10: fatal error: 'gtest/gtest_prod.h' file not found | ||
9 | | #include <gtest/gtest_prod.h> | ||
10 | | ^~~~~~~~~~~~~~~~~~~~ | ||
11 | | 1 error generated. | ||
12 | | In file included from fastboot/socket.cpp:29: | ||
13 | | fastboot/socket.h:43:10: fatal error: 'gtest/gtest_prod.h' file not found | ||
14 | | #include <gtest/gtest_prod.h> | ||
15 | | ^~~~~~~~~~~~~~~~~~~~ | ||
16 | | 1 error generated. | ||
17 | | In file included from fastboot/tcp.cpp:29: | ||
18 | | In file included from fastboot/tcp.h:36: | ||
19 | | fastboot/socket.h:43:10: fatal error: 'gtest/gtest_prod.h' file not found | ||
20 | | #include <gtest/gtest_prod.h> | ||
21 | | ^~~~~~~~~~~~~~~~~~~~ | ||
22 | | 1 error generated. | ||
23 | | In file included from fastboot/udp.cpp:31: | ||
24 | | In file included from fastboot/udp.h:34: | ||
25 | | fastboot/socket.h:43:10: fatal error: 'gtest/gtest_prod.h' file not found | ||
26 | | #include <gtest/gtest_prod.h> | ||
27 | | ^~~~~~~~~~~~~~~~~~~~ | ||
28 | | 1 error generated. | ||
29 | |||
30 | |||
31 | Signed-off-by: Nisha Parrakat <Nisha.Parrakat@kpit.com> | ||
32 | |||
33 | --- a/system/core/fastboot/socket.h 2021-04-14 21:14:00.355973915 +0000 | ||
34 | +++ b/system/core/fastboot/socket.h 2021-04-14 21:14:21.879680699 +0000 | ||
35 | @@ -40,7 +40,6 @@ | ||
36 | |||
37 | #include <android-base/macros.h> | ||
38 | #include <cutils/sockets.h> | ||
39 | -#include <gtest/gtest_prod.h> | ||
40 | |||
41 | // Socket interface to be implemented for each platform. | ||
42 | class Socket { | ||
43 | @@ -119,8 +118,6 @@ | ||
44 | socket_send_buffers_function_ = &socket_send_buffers; | ||
45 | |||
46 | private: | ||
47 | - FRIEND_TEST(SocketTest, TestTcpSendBuffers); | ||
48 | - FRIEND_TEST(SocketTest, TestUdpSendBuffers); | ||
49 | |||
50 | DISALLOW_COPY_AND_ASSIGN(Socket); | ||
51 | }; | ||