Skip to content

Commit 7bc750d

Browse files
refactor: move the header files to the fakelinker subdirectory
1 parent ee908f0 commit 7bc750d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+85
-81
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ build/
1515
.externalNativeBuild
1616
.cxx
1717
local.properties
18-
library/src/main/cpp/include/linker_version.h
18+
library/src/main/cpp/include/fakelinker/linker_version.h

library/src/main/cpp/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if(NOT DEFINED FAKELINKER_MODULE_VERSION_NAME)
4747
set(FAKELINKER_MODULE_VERSION_NAME "3.1.0")
4848
endif()
4949

50-
configure_file("${CMAKE_CURRENT_LIST_DIR}/module_config.h.in" "${CMAKE_CURRENT_LIST_DIR}/include/linker_version.h")
50+
configure_file("${CMAKE_CURRENT_LIST_DIR}/module_config.h.in" "${CMAKE_CURRENT_LIST_DIR}/include/fakelinker/linker_version.h")
5151

5252
message(STATUS "cmake version:${CMAKE_VERSION}
5353
api:${ANDROID_PLATFORM}
@@ -152,12 +152,12 @@ if(FAKELINKER_INSTALL_TARGET)
152152
)
153153

154154
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
155-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fakelinker/fakelinker
155+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fakelinker
156156
)
157157

158158
if(FAKELINKER_INSTALL_PRIVATE_HEADERS)
159159
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/linker"
160-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fakelinker/fakelinker
160+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fakelinker
161161
FILES_MATCHING PATTERN "*.h"
162162
)
163163
endif()

library/src/main/cpp/common/maps_util.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Created by beich on 2020/11/12.
33
//
44

5+
#include "fakelinker/maps_util.h"
6+
57
#include <fcntl.h>
68
#include <sys/stat.h>
79

@@ -10,9 +12,9 @@
1012
#include <cstring>
1113
#include <ctime>
1214

13-
#include "alog.h"
14-
#include "macros.h"
15-
#include "maps_util.h"
15+
#include <fakelinker/alog.h>
16+
#include <fakelinker/macros.h>
17+
1618

1719
#define MAPS_PATH "/proc/self/maps"
1820

library/src/main/cpp/common/unique_fd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Created by beich on 2022/5/26.
33
//
44

5-
#include "unique_fd.h"
5+
#include "fakelinker/unique_fd.h"
66

77
#include <fcntl.h>
88
#include <sys/stat.h>

library/src/main/cpp/common/unique_memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "unique_memory.h"
1+
#include "fakelinker/unique_memory.h"
22

33
#include <malloc.h>
44
#include <stdlib.h>
File renamed without changes.

library/src/main/cpp/include/android_level_compat.h renamed to library/src/main/cpp/include/fakelinker/android_level_compat.h

File renamed without changes.

library/src/main/cpp/include/art_symbol.h renamed to library/src/main/cpp/include/fakelinker/art_symbol.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include <string>
66

7-
#include <linker_macros.h>
8-
#include <macros.h>
7+
#include "linker_macros.h"
8+
#include "macros.h"
99

1010
namespace art {
1111

library/src/main/cpp/include/default_trace_jni.h renamed to library/src/main/cpp/include/fakelinker/default_trace_jni.h

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)