Skip to content

Commit aa13480

Browse files
lzhiyonglzhiyong
committed
update to android tools 35.0.2
0 parents  commit aa13480

Some content is hidden

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

58 files changed

+23317
-0
lines changed

‎.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
CMakeCache.txt
2+
CMakeFiles
3+
CMakeScripts
4+
Testing
5+
Makefile
6+
cmake_install.cmake
7+
install_manifest.txt
8+
compile_commands.json
9+
CTestTestfile.cmake
10+
build
11+
pack
12+
src

‎CMakeLists.txt

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
#
2+
# Copyright © 2022 Github Lzhiyong
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
cmake_minimum_required(VERSION 3.14.2)
18+
project(sdk-tools)
19+
20+
set(CMAKE_C_STANDARD 11)
21+
set(CMAKE_CXX_STANDARD 20)
22+
enable_language(ASM)
23+
24+
# set global cflags and cxxflags
25+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics -fPIC -Wno-attributes")
26+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics -fPIC -Wno-attributes")
27+
# static link (may need some patches)
28+
#set(CMAKE_EXE_LINKER_FLAGS "-static")
29+
30+
# platform tools version
31+
# see the patches/other/platform_tools_version.h
32+
set(TOOLS_VERSION 35.0.3)
33+
set(SRC ${PROJECT_SOURCE_DIR}/src)
34+
35+
# 64-bit off_t for lseek.
36+
add_definitions(-D_FILE_OFFSET_BITS=64)
37+
38+
set(PROTOC_COMPILER)
39+
40+
if(DEFINED PROTOC_PATH)
41+
set(PROTOC_COMPILER ${PROTOC_PATH})
42+
43+
if(NOT EXISTS ${PROTOC_COMPILER})
44+
unset(PROTOC_PATH CACHE)
45+
message(FATAL_ERROR "Invalid protoc: ${PROTOC_COMPILER}, please check if the path is correct")
46+
endif()
47+
48+
# check protoc version
49+
execute_process(
50+
COMMAND ${PROTOC_COMPILER} --version
51+
OUTPUT_VARIABLE PTOTOBUF_VERSION
52+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
53+
)
54+
55+
if(NOT PTOTOBUF_VERSION MATCHES "^libprotoc*")
56+
unset(PROTOC_PATH CACHE)
57+
message(FATAL_ERROR "Invalid protoc: ${PROTOC_COMPILER}, this may not be an executable")
58+
endif()
59+
60+
string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" VERSIONS ${PTOTOBUF_VERSION})
61+
# please note that if the protobuf version is too high, you may encounter the following error
62+
# error: This file was generated by a newer version of protoc
63+
if(VERSIONS VERSION_GREATER "3.21.12")
64+
message(WARNING "${PTOTOBUF_VERSION}, the protobuf version is too high, may be incompatible!!")
65+
endif()
66+
endif()
67+
68+
# thrid-party libraries
69+
add_subdirectory(src/boringssl EXCLUDE_FROM_ALL)
70+
add_subdirectory(src/fmtlib EXCLUDE_FROM_ALL)
71+
add_subdirectory(src/pcre EXCLUDE_FROM_ALL)
72+
add_subdirectory(src/libpng EXCLUDE_FROM_ALL)
73+
add_subdirectory(src/zopfli EXCLUDE_FROM_ALL)
74+
add_subdirectory(src/jsoncpp EXCLUDE_FROM_ALL)
75+
add_subdirectory(src/expat/expat EXCLUDE_FROM_ALL)
76+
add_subdirectory(src/zstd/build/cmake EXCLUDE_FROM_ALL)
77+
add_subdirectory(src/lz4/build/cmake EXCLUDE_FROM_ALL)
78+
add_subdirectory(src/brotli EXCLUDE_FROM_ALL)
79+
add_subdirectory(src/abseil-cpp EXCLUDE_FROM_ALL)
80+
add_subdirectory(src/protobuf EXCLUDE_FROM_ALL)
81+
add_subdirectory(src/googletest EXCLUDE_FROM_ALL)
82+
add_subdirectory(src/tinyxml2 EXCLUDE_FROM_ALL)
83+
84+
# building sdk-tools
85+
add_subdirectory(lib)
86+
add_subdirectory(build-tools)
87+
add_subdirectory(platform-tools)
88+
add_subdirectory(others)
89+
90+
# creating source tarballs
91+
set(CPACK_PACKAGE_DIRECTORY ${PROJECT_SOURCE_DIR}/pack)
92+
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
93+
set(CPACK_SOURCE_GENERATOR "TXZ")
94+
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${TOOLS_VERSION}")
95+
set(CPACK_SOURCE_IGNORE_FILES
96+
${PROJECT_SOURCE_DIR}/.git
97+
${PROJECT_SOURCE_DIR}/.gitignore
98+
${PROJECT_SOURCE_DIR}/.gitmodules
99+
${PROJECT_SOURCE_DIR}/get_source.py
100+
${PROJECT_SOURCE_DIR}/build
101+
${PROJECT_SOURCE_DIR}/patches
102+
${PROJECT_SOURCE_DIR}/pack
103+
)
104+
105+
include(CPack)
106+

‎LICENSE.txt

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+

‎README.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
Building platform-tools and build-tools for Android, such as `aapt aapt2 aidl zipalign adb fastboot` ... etc.
2+
3+
If you need other tools, please refer to existing tools to add CMake file.
4+
5+
Currently, only aarch64 has been tested, and it is not guaranteed to work for other architectures.
6+
7+
In order to save storage and bandwidth, I have removed all submodules and no longer provide source code compressed packages.
8+
9+
I believe that as long as you have the C/C++ and CMake foundation, it can be easily solved by referring to the patch files.
10+
11+
****
12+
13+
### How to build
14+
First, we need to use `get_source.py` to clone the source code of all repositories.
15+
16+
Please note that patch files only apply to specific branches or tags, so we may need to patch manually.
17+
18+
```bash
19+
# default is master branch
20+
python get_source.py
21+
22+
# specific branches or tags
23+
python get_source.py --tags platform-tools-35.0.2
24+
25+
# or tags xxx
26+
# see available tags https://android.googlesource.com/platform/frameworks/base/+refs
27+
python get_source.py --tags xxx
28+
29+
```
30+
31+
****
32+
33+
Second, we need to build `protobuf` for the host OS which will be used to generate the required sources.
34+
35+
```bash
36+
# protobuf source directory
37+
cd src/protobuf && mkdir build && cd build
38+
39+
# skip the googletest
40+
cmake -GNinja -Dprotobuf_BUILD_TESTS=OFF ..
41+
42+
# building the protoc-xxx executable file
43+
ninja -j$(nproc --all)
44+
45+
```
46+
47+
****
48+
49+
Finally, we can use the `NDK` to start building the Android SDK Tools.
50+
51+
Please note that it is only applicable to Android ndk for compilation, not applicable to other Linux distributions.
52+
53+
```bash
54+
# abi [arm64-v8a, armeabi-v7a, x86, x86_64]
55+
# use the protoc-xxx we compiled before
56+
# note the protoc requires absolute path
57+
python build.py \
58+
--ndk=/path/to/android-ndk-xxx \
59+
--abi=arm64-v8a \
60+
--build=build/aarch64 \
61+
--protoc=/path/to/protoc-xxx
62+
63+
# I think you should build each target separately for better error resolution
64+
# like appt2 adb fastboot...etc
65+
python build.py \
66+
--ndk=/path/to/android-ndk-xxx \
67+
--abi=arm64-v8a \
68+
--build=build/aarch64 \
69+
--protoc=/path/to/protoc-xxx \
70+
--target=aapt2
71+
72+
# for other options, please execute
73+
python build.py --help
74+
75+
```
76+
77+
****
78+

0 commit comments

Comments
 (0)