├── LICENSE ├── README.md ├── build ├── android-11.0.0_r33 │ ├── aapt │ │ ├── arm64-v8a │ │ │ └── bin │ │ │ │ └── aapt │ │ ├── armeabi-v7a │ │ │ └── bin │ │ │ │ └── aapt │ │ ├── x86 │ │ │ └── bin │ │ │ │ └── aapt │ │ └── x86_64 │ │ │ └── bin │ │ │ └── aapt │ ├── aapt2 │ │ ├── arm64-v8a │ │ │ ├── bin │ │ │ │ └── aapt2 │ │ │ ├── lib │ │ │ │ └── libaapt2.so │ │ │ └── lib64 │ │ │ │ └── libaapt2.so │ │ ├── armeabi-v7a │ │ │ ├── bin │ │ │ │ └── aapt2 │ │ │ └── lib │ │ │ │ └── libaapt2.so │ │ ├── x86 │ │ │ ├── bin │ │ │ │ └── aapt2 │ │ │ └── lib │ │ │ │ └── libaapt2.so │ │ └── x86_64 │ │ │ ├── bin │ │ │ └── aapt2 │ │ │ ├── lib │ │ │ └── libaapt2.so │ │ │ └── lib64 │ │ │ └── libaapt2.so │ ├── aidl │ │ ├── arm64-v8a │ │ │ └── bin │ │ │ │ └── aidl │ │ ├── armeabi-v7a │ │ │ └── bin │ │ │ │ └── aidl │ │ ├── x86 │ │ │ └── bin │ │ │ │ └── aidl │ │ └── x86_64 │ │ │ └── bin │ │ │ └── aidl │ └── zipalign │ │ ├── arm64-v8a │ │ └── bin │ │ │ └── zipalign │ │ ├── armeabi-v7a │ │ └── bin │ │ │ └── zipalign │ │ ├── x86 │ │ └── bin │ │ │ └── zipalign │ │ └── x86_64 │ │ └── bin │ │ └── zipalign └── android-9.0.0_r33 │ ├── aapt │ ├── arm64-v8a │ │ ├── bin │ │ │ └── aapt │ │ ├── lib │ │ │ └── libaapt.so │ │ └── lib64 │ │ │ └── libaapt.so │ ├── armeabi-v7a │ │ ├── bin │ │ │ └── aapt │ │ └── lib │ │ │ └── libaapt.so │ ├── x86 │ │ ├── bin │ │ │ └── aapt │ │ └── lib │ │ │ └── libaapt.so │ └── x86_64 │ │ ├── bin │ │ └── aapt │ │ ├── lib │ │ └── libaapt.so │ │ └── lib64 │ │ └── libaapt.so │ ├── aapt2 │ ├── arm64-v8a │ │ ├── bin │ │ │ └── aapt2 │ │ ├── lib │ │ │ ├── libaapt2.so │ │ │ └── libaapt2_jni.so │ │ └── lib64 │ │ │ ├── libaapt2.so │ │ │ └── libaapt2_jni.so │ ├── armeabi-v7a │ │ ├── bin │ │ │ └── aapt2 │ │ └── lib │ │ │ └── libaapt2.so │ ├── x86 │ │ ├── bin │ │ │ └── aapt2 │ │ └── lib │ │ │ ├── libaapt2.so │ │ │ └── libaapt2_jni.so │ └── x86_64 │ │ ├── bin │ │ └── aapt2 │ │ ├── lib │ │ ├── libaapt2.so │ │ └── libaapt2_jni.so │ │ └── lib64 │ │ ├── libaapt2.so │ │ └── libaapt2_jni.so │ ├── dex2oat │ ├── arm64-v8a │ │ └── bin │ │ │ └── dex2oat │ ├── armeabi-v7a │ │ └── bin │ │ │ └── dex2oat │ ├── x86 │ │ └── bin │ │ │ └── dex2oat │ └── x86_64 │ │ └── bin │ │ └── dex2oat │ ├── dexdiag │ ├── arm64-v8a │ │ └── bin │ │ │ └── dexdiag │ ├── armeabi-v7a │ │ └── bin │ │ │ └── dexdiag │ ├── x86 │ │ └── bin │ │ │ └── dexdiag │ └── x86_64 │ │ └── bin │ │ └── dexdiag │ ├── dexdump │ ├── arm64-v8a │ │ └── bin │ │ │ └── dexdump │ ├── armeabi-v7a │ │ └── bin │ │ │ └── dexdump │ ├── x86 │ │ └── bin │ │ │ └── dexdump │ └── x86_64 │ │ └── bin │ │ └── dexdump │ └── dexlist │ ├── arm64-v8a │ └── bin │ │ └── dexlist │ ├── armeabi-v7a │ └── bin │ │ └── dexlist │ ├── x86 │ └── bin │ │ └── dexlist │ └── x86_64 │ └── bin │ └── dexlist ├── cm ├── Dockerfile ├── build.sh ├── build.yml └── release.sh ├── latest └── patch ├── android-11.0.0_r33 ├── build │ └── + │ │ └── tools │ │ └── zipalign │ │ └── Android.bp.patch └── system │ └── tools │ └── aidl │ └── + │ └── Android.bp.patch └── android-9.0.0_r33 ├── build └── + │ └── tools │ └── zipalign │ └── Android.bp.patch └── frameworks └── base └── + ├── libs └── androidfw │ └── Android.bp.patch └── tools ├── aapt └── Android.bp.patch └── aapt2 └── Android.bp.patch /LICENSE: -------------------------------------------------------------------------------- 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 | APPENDIX: How to apply the Apache License to your work. 179 | 180 | To apply the Apache License to your work, attach the following 181 | boilerplate notice, with the fields enclosed by brackets "[]" 182 | replaced with your own identifying information. (Don't include 183 | the brackets!) The text should be enclosed in the appropriate 184 | comment syntax for the file format. We also recommend that a 185 | file or class name and description of purpose be included on the 186 | same "printed page" as the copyright notice for easier 187 | identification within third-party archives. 188 | 189 | Copyright [yyyy] [name of copyright owner] 190 | 191 | Licensed under the Apache License, Version 2.0 (the "License"); 192 | you may not use this file except in compliance with the License. 193 | You may obtain a copy of the License at 194 | 195 | http://www.apache.org/licenses/LICENSE-2.0 196 | 197 | Unless required by applicable law or agreed to in writing, software 198 | distributed under the License is distributed on an "AS IS" BASIS, 199 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 200 | See the License for the specific language governing permissions and 201 | limitations under the License. 202 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # android-tools 2 | 3 | ## What is this? 4 | 5 | This project is aimed at providing popular Android tools (e.g. aapt, aapt2, etc.) that can be run directly on Android devices. Although these tools are already packaged in the [Android SDK](https://developer.android.com/studio), the SDK only provides them for ABIs targetting the PC (e.g. x86 or x86_64). 6 | 7 | For a complete list of the Android tools provided by this project, please see the [build folder](https://github.com/jonforshort/android-tools/tree/master/build/android-9.0.0_r33). 8 | 9 | ## Why is this useful? 10 | 11 | I created this project because I needed to analyze APKs on the device as part of my Android app. Although there are already projects out there that allow you to do this off-device -- most notably [apk tool](https://ibotpeaches.github.io/Apktool/), there isn't a project (as far as I know) that allows you to do this directly on-device. 12 | 13 | ## How was this done? 14 | 15 | The work for this project is straightforward. A lot of these tools are already being built as part of the Android Open Source Project (AOSP) source code. The work is to simply modify the build scripts for each of the desired tools to build for the desired architectures. 16 | 17 | For more information on how to build the AOSP project, please see the official [Android Build Documentation.](https://source.android.com/setup/build/requirements) 18 | 19 | ## Will you be providing patches for the modified build scripts? 20 | 21 | Yes, please see the top-level directory "patch". The structure of this directory (as well as the build directory) is as follows. 22 | 23 | patch// 24 | 25 | ## How can I help? 26 | 27 | The best way to help is to find an Android tool you think is valuable to include in this project, and then submit a build script patch for it. Here is a list of tools that is currently on my to-do list. 28 | 29 | * apkanalyzer (https://developer.android.com/studio/command-line/apkanalyzer) 30 | * apksigner (https://developer.android.com/studio/command-line/apksigner) 31 | -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt/arm64-v8a/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt/arm64-v8a/bin/aapt -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt/armeabi-v7a/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt/armeabi-v7a/bin/aapt -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt/x86/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt/x86/bin/aapt -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt/x86_64/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt/x86_64/bin/aapt -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/arm64-v8a/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/arm64-v8a/bin/aapt2 -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/arm64-v8a/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/arm64-v8a/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/arm64-v8a/lib64/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/arm64-v8a/lib64/libaapt2.so -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/armeabi-v7a/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/armeabi-v7a/bin/aapt2 -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/armeabi-v7a/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/armeabi-v7a/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/x86/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/x86/bin/aapt2 -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/x86/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/x86/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/x86_64/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/x86_64/bin/aapt2 -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/x86_64/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/x86_64/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aapt2/x86_64/lib64/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aapt2/x86_64/lib64/libaapt2.so -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aidl/arm64-v8a/bin/aidl: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aidl/arm64-v8a/bin/aidl -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aidl/armeabi-v7a/bin/aidl: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aidl/armeabi-v7a/bin/aidl -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aidl/x86/bin/aidl: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aidl/x86/bin/aidl -------------------------------------------------------------------------------- /build/android-11.0.0_r33/aidl/x86_64/bin/aidl: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/aidl/x86_64/bin/aidl -------------------------------------------------------------------------------- /build/android-11.0.0_r33/zipalign/arm64-v8a/bin/zipalign: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/zipalign/arm64-v8a/bin/zipalign -------------------------------------------------------------------------------- /build/android-11.0.0_r33/zipalign/armeabi-v7a/bin/zipalign: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/zipalign/armeabi-v7a/bin/zipalign -------------------------------------------------------------------------------- /build/android-11.0.0_r33/zipalign/x86/bin/zipalign: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/zipalign/x86/bin/zipalign -------------------------------------------------------------------------------- /build/android-11.0.0_r33/zipalign/x86_64/bin/zipalign: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-11.0.0_r33/zipalign/x86_64/bin/zipalign -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/arm64-v8a/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/arm64-v8a/bin/aapt -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/arm64-v8a/lib/libaapt.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/arm64-v8a/lib/libaapt.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/arm64-v8a/lib64/libaapt.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/arm64-v8a/lib64/libaapt.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/armeabi-v7a/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/armeabi-v7a/bin/aapt -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/armeabi-v7a/lib/libaapt.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/armeabi-v7a/lib/libaapt.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/x86/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/x86/bin/aapt -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/x86/lib/libaapt.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/x86/lib/libaapt.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/x86_64/bin/aapt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/x86_64/bin/aapt -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/x86_64/lib/libaapt.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/x86_64/lib/libaapt.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt/x86_64/lib64/libaapt.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt/x86_64/lib64/libaapt.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/arm64-v8a/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/arm64-v8a/bin/aapt2 -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/arm64-v8a/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/arm64-v8a/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/arm64-v8a/lib/libaapt2_jni.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/arm64-v8a/lib/libaapt2_jni.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/arm64-v8a/lib64/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/arm64-v8a/lib64/libaapt2.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/arm64-v8a/lib64/libaapt2_jni.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/arm64-v8a/lib64/libaapt2_jni.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/armeabi-v7a/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/armeabi-v7a/bin/aapt2 -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/armeabi-v7a/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/armeabi-v7a/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86/bin/aapt2 -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86/lib/libaapt2_jni.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86/lib/libaapt2_jni.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86_64/bin/aapt2: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86_64/bin/aapt2 -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86_64/lib/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86_64/lib/libaapt2.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86_64/lib/libaapt2_jni.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86_64/lib/libaapt2_jni.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86_64/lib64/libaapt2.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86_64/lib64/libaapt2.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/aapt2/x86_64/lib64/libaapt2_jni.so: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/aapt2/x86_64/lib64/libaapt2_jni.so -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dex2oat/arm64-v8a/bin/dex2oat: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dex2oat/arm64-v8a/bin/dex2oat -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dex2oat/armeabi-v7a/bin/dex2oat: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dex2oat/armeabi-v7a/bin/dex2oat -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dex2oat/x86/bin/dex2oat: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dex2oat/x86/bin/dex2oat -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dex2oat/x86_64/bin/dex2oat: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dex2oat/x86_64/bin/dex2oat -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdiag/arm64-v8a/bin/dexdiag: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdiag/arm64-v8a/bin/dexdiag -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdiag/armeabi-v7a/bin/dexdiag: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdiag/armeabi-v7a/bin/dexdiag -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdiag/x86/bin/dexdiag: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdiag/x86/bin/dexdiag -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdiag/x86_64/bin/dexdiag: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdiag/x86_64/bin/dexdiag -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdump/arm64-v8a/bin/dexdump: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdump/arm64-v8a/bin/dexdump -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdump/armeabi-v7a/bin/dexdump: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdump/armeabi-v7a/bin/dexdump -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdump/x86/bin/dexdump: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdump/x86/bin/dexdump -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexdump/x86_64/bin/dexdump: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexdump/x86_64/bin/dexdump -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexlist/arm64-v8a/bin/dexlist: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexlist/arm64-v8a/bin/dexlist -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexlist/armeabi-v7a/bin/dexlist: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexlist/armeabi-v7a/bin/dexlist -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexlist/x86/bin/dexlist: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexlist/x86/bin/dexlist -------------------------------------------------------------------------------- /build/android-9.0.0_r33/dexlist/x86_64/bin/dexlist: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/JonForShort/android-tools/10582e58cf2298f9fae99753f1d5d8ca40a55641/build/android-9.0.0_r33/dexlist/x86_64/bin/dexlist -------------------------------------------------------------------------------- /cm/Dockerfile: -------------------------------------------------------------------------------- 1 | FROM ubuntu:16.04 2 | 3 | # 4 | # Install dependencies. 5 | # 6 | RUN apt-get update && \ 7 | apt-get install -y bc bison bsdmainutils build-essential curl flex g++-multilib gcc-multilib git gnupg gperf \ 8 | lib32ncurses5-dev lib32z1-dev libesd0-dev libncurses5-dev libsdl1.2-dev libwxgtk3.0-dev libxml2-utils lzop \ 9 | sudo openjdk-8-jdk pngcrush schedtool xsltproc zip zlib1g-dev graphviz && \ 10 | apt -y autoclean && apt -y autoremove && apt clean 11 | 12 | # 13 | # Install tools. 14 | # 15 | ADD https://commondatastorage.googleapis.com/git-repo-downloads/repo /usr/local/bin/ 16 | RUN chmod 755 /usr/local/bin/repo 17 | 18 | # 19 | # Add scripts. 20 | # 21 | COPY release.sh /usr/local/bin/release.sh 22 | RUN chmod 755 /usr/local/bin/release.sh 23 | 24 | COPY build.sh /usr/local/bin/build.sh 25 | RUN chmod 755 /usr/local/bin/build.sh 26 | 27 | # 28 | # Add new user and set currenty working directory. 29 | # 30 | RUN useradd -ms /bin/bash aosp 31 | USER aosp 32 | WORKDIR /home/aosp 33 | -------------------------------------------------------------------------------- /cm/build.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | 3 | cwd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 4 | 5 | -------------------------------------------------------------------------------- /cm/build.yml: -------------------------------------------------------------------------------- 1 | trigger: 2 | - master 3 | 4 | pool: 5 | vmImage: 'ubuntu-latest' 6 | 7 | container: thejunkjon/android-tools:latest 8 | 9 | steps: 10 | - script: printenv 11 | -------------------------------------------------------------------------------- /cm/release.sh: -------------------------------------------------------------------------------- 1 | #!/usr/bin/env bash 2 | 3 | cwd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 4 | 5 | release_folder="${cwd}/latest" 6 | if [[ -f ${release_folder} ]]; then 7 | echo "error: unable to find release folder" 8 | exit -1 9 | fi 10 | 11 | if [ $# -ne 1 ]; then 12 | echo "error: must specify path to output directory" 13 | exit -2 14 | fi 15 | 16 | output_folder=$(readlink -f ${1}) 17 | if [[ -f ${output_folder} ]]; then 18 | echo "error: must specify path to output directory; found a file path" 19 | exit -3 20 | fi 21 | 22 | mkdir -p ${output_folder} || true 23 | 24 | temp_folder=$(mktemp -d) 25 | 26 | for i in $(ls ${release_folder}); do 27 | cp -RT ${release_folder}/${i} ${temp_folder} 28 | done 29 | 30 | output_file=${output_folder}/android-tools.tgz 31 | 32 | tar -zcvf ${output_file} -C ${temp_folder} . 33 | 34 | echo "" 35 | echo "release created successfully" 36 | echo "" 37 | echo "${output_file}" 38 | echo "" 39 | -------------------------------------------------------------------------------- /latest: -------------------------------------------------------------------------------- 1 | build/android-9.0.0_r33 -------------------------------------------------------------------------------- /patch/android-11.0.0_r33/build/+/tools/zipalign/Android.bp.patch: -------------------------------------------------------------------------------- 1 | 36a37,66 2 | > 3 | > cc_binary { 4 | > name: "zipalign_android", 5 | > 6 | > srcs: [ 7 | > "ZipAlign.cpp", 8 | > "ZipEntry.cpp", 9 | > "ZipFile.cpp", 10 | > ], 11 | > 12 | > cflags: ["-Wall", "-Werror"], 13 | > 14 | > // NOTE: Do not add any shared_libs dependencies because they will break the 15 | > // static_sdk_tools target. 16 | > static_libs: [ 17 | > "libutils", 18 | > "libcutils", 19 | > "liblog", 20 | > "libziparchive", 21 | > "libz", 22 | > "libbase", 23 | > "libzopfli", 24 | > ], 25 | > 26 | > target: { 27 | > android: { 28 | > enabled: true, 29 | > }, 30 | > }, 31 | > } 32 | -------------------------------------------------------------------------------- /patch/android-11.0.0_r33/system/tools/aidl/+/Android.bp.patch: -------------------------------------------------------------------------------- 1 | 93a94,109 2 | > cc_binary { 3 | > name: "aidl_android", 4 | > defaults: ["aidl_defaults"], 5 | > srcs: ["main.cpp"], 6 | > static_libs: [ 7 | > "libaidl-common", 8 | > "libbase", 9 | > "liblog", 10 | > ], 11 | > target: { 12 | > android: { 13 | > enabled: true 14 | > } 15 | > } 16 | > } 17 | > 18 | -------------------------------------------------------------------------------- /patch/android-9.0.0_r33/build/+/tools/zipalign/Android.bp.patch: -------------------------------------------------------------------------------- 1 | diff --git a/tools/zipalign/Android.bp b/tools/zipalign/Android.bp 2 | index 8e6196d29..2457ca8e8 100644 3 | --- a/tools/zipalign/Android.bp 4 | +++ b/tools/zipalign/Android.bp 5 | @@ -4,7 +4,7 @@ 6 | // Zip alignment tool 7 | // 8 | 9 | -cc_binary_host { 10 | +cc_binary { 11 | name: "zipalign", 12 | 13 | srcs: [ 14 | @@ -32,5 +32,8 @@ cc_binary_host { 15 | host_ldlibs: ["-lpthread"], 16 | enabled: true, 17 | }, 18 | + android: { 19 | + enabled: true, 20 | + }, 21 | }, 22 | } 23 | -------------------------------------------------------------------------------- /patch/android-9.0.0_r33/frameworks/base/+/libs/androidfw/Android.bp.patch: -------------------------------------------------------------------------------- 1 | diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp 2 | index 0c32fdf5baf..8eaa85a0ba0 100644 3 | --- a/libs/androidfw/Android.bp 4 | +++ b/libs/androidfw/Android.bp 5 | @@ -25,6 +25,10 @@ cc_defaults { 6 | // The Windows compiler warns incorrectly for value initialization with {}. 7 | cppflags: ["-Wno-missing-field-initializers"], 8 | }, 9 | + android: { 10 | + cflags: ["-DSTATIC_ANDROIDFW_FOR_TOOLS"], 11 | + enabled: true, 12 | + }, 13 | host: { 14 | cflags: ["-DSTATIC_ANDROIDFW_FOR_TOOLS"], 15 | }, 16 | @@ -82,7 +86,7 @@ cc_library { 17 | "libz", 18 | ], 19 | static: { 20 | - enabled: false, 21 | + enabled: true, 22 | }, 23 | }, 24 | host: { 25 | -------------------------------------------------------------------------------- /patch/android-9.0.0_r33/frameworks/base/+/tools/aapt/Android.bp.patch: -------------------------------------------------------------------------------- 1 | diff --git a/tools/aapt/Android.bp b/tools/aapt/Android.bp 2 | index f3673973077..8dd831527f5 100644 3 | --- a/tools/aapt/Android.bp 4 | +++ b/tools/aapt/Android.bp 5 | @@ -35,6 +35,11 @@ cc_defaults { 6 | ], 7 | group_static_libs: true, 8 | 9 | + // 10 | + // Creates an executable that statically links to its dependencies (e.g. bionic). 11 | + // 12 | + static_executable: true, 13 | + 14 | cflags: [ 15 | "-Wall", 16 | "-Werror", 17 | @@ -44,6 +49,13 @@ cc_defaults { 18 | windows: { 19 | enabled: true, 20 | }, 21 | + 22 | + // 23 | + // Build for Android devices. 24 | + // 25 | + android: { 26 | + enabled: true, 27 | + }, 28 | }, 29 | 30 | // This tool is prebuilt if we're doing an app-only build. 31 | @@ -60,13 +72,23 @@ cc_defaults { 32 | // ========================================================== 33 | // Build the host static library: libaapt 34 | // ========================================================== 35 | -cc_library_host_static { 36 | +cc_library { 37 | name: "libaapt", 38 | defaults: ["aapt_defaults"], 39 | + host_supported: true, 40 | target: { 41 | darwin: { 42 | cflags: ["-D_DARWIN_UNLIMITED_STREAMS"], 43 | }, 44 | + 45 | + // 46 | + // Build as a static library targetting Android devices. 47 | + // 48 | + android: { 49 | + static: { 50 | + enabled: true, 51 | + }, 52 | + } 53 | }, 54 | cflags: [ 55 | "-Wno-format-y2k", 56 | @@ -103,18 +125,23 @@ cc_library_host_static { 57 | // ========================================================== 58 | // Build the host executable: aapt 59 | // ========================================================== 60 | -cc_binary_host { 61 | +cc_binary { 62 | name: "aapt", 63 | defaults: ["aapt_defaults"], 64 | srcs: ["Main.cpp"], 65 | use_version_lib: true, 66 | - static_libs: ["libaapt"], 67 | + host_supported: true, 68 | + 69 | + // 70 | + // Create an uber-static library that has all of its dependencies packaged with it. 71 | + // 72 | + whole_static_libs: ["libaapt"], 73 | } 74 | 75 | // ========================================================== 76 | // Build the host tests: libaapt_tests 77 | // ========================================================== 78 | -cc_test_host { 79 | +cc_test { 80 | name: "libaapt_tests", 81 | defaults: ["aapt_defaults"], 82 | srcs: [ 83 | -------------------------------------------------------------------------------- /patch/android-9.0.0_r33/frameworks/base/+/tools/aapt2/Android.bp.patch: -------------------------------------------------------------------------------- 1 | diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp 2 | index 750fb56b279..b5a0615dbaf 100644 3 | --- a/tools/aapt2/Android.bp 4 | +++ b/tools/aapt2/Android.bp 5 | @@ -44,6 +44,9 @@ cc_defaults { 6 | darwin: { 7 | cflags: ["-D_DARWIN_UNLIMITED_STREAMS"], 8 | }, 9 | + android: { 10 | + enabled: true, 11 | + }, 12 | }, 13 | static_libs: [ 14 | "libandroidfw", 15 | @@ -58,6 +61,7 @@ cc_defaults { 16 | "libz", 17 | ], 18 | group_static_libs: true, 19 | + static_executable: true, 20 | } 21 | 22 | // ========================================================== 23 | @@ -67,9 +71,9 @@ cc_defaults { 24 | // ========================================================== 25 | 26 | // ========================================================== 27 | -// Build the host static library: aapt2 28 | +// Build the static library: aapt2 29 | // ========================================================== 30 | -cc_library_host_static { 31 | +cc_library { 32 | name: "libaapt2", 33 | srcs: [ 34 | "compile/IdAssigner.cpp", 35 | @@ -153,24 +157,24 @@ cc_library_host_static { 36 | // ========================================================== 37 | // Build the host shared library: aapt2_jni 38 | // ========================================================== 39 | -cc_library_host_shared { 40 | +cc_library { 41 | name: "libaapt2_jni", 42 | srcs: toolSources + ["jni/aapt2_jni.cpp"], 43 | - static_libs: ["libaapt2"], 44 | + whole_static_libs: ["libaapt2"], 45 | defaults: ["aapt2_defaults"], 46 | } 47 | 48 | // ========================================================== 49 | // Build the host tests: aapt2_tests 50 | // ========================================================== 51 | -cc_test_host { 52 | +cc_test { 53 | name: "aapt2_tests", 54 | srcs: [ 55 | "test/Builders.cpp", 56 | "test/Common.cpp", 57 | "**/*_test.cpp", 58 | ] + toolSources, 59 | - static_libs: [ 60 | + whole_static_libs: [ 61 | "libaapt2", 62 | "libgmock", 63 | ], 64 | @@ -181,9 +185,9 @@ cc_test_host { 65 | // ========================================================== 66 | // Build the host executable: aapt2 67 | // ========================================================== 68 | -cc_binary_host { 69 | +cc_binary { 70 | name: "aapt2", 71 | srcs: ["Main.cpp"] + toolSources, 72 | - static_libs: ["libaapt2"], 73 | defaults: ["aapt2_defaults"], 74 | + whole_static_libs: ["libaapt2"], 75 | } 76 | --------------------------------------------------------------------------------