summaryrefslogtreecommitdiff
path: root/util/android_config.h
Commit message (Collapse)AuthorAgeFilesLines
* lib, misc: eliminate dependency on WinsockEric Biggers2023-01-271-1/+0
| | | | | | | | | | | | | | Currently Windows builds of e2fsprogs rely on the Windows Socket API (Winsock) to provide htonl() and ntohl(). For this to actually work, though, HAVE_WINSOCK_H needs to be defined, and the binaries need to be linked to -lws2_32. The Android.bp files do this; however, the autotools-based build system does not. Since htonl() and ntohl() are trivial, let's instead just add a file include/mingw/arpa/inet.h with definitions for these. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* AOSP: Fix macOS build.David Anderson2018-08-051-1/+3
| | | | | | | | | Signed-off-by: Theodore Ts'o <tytso@mit.edu> Bug: 111839488 Test: e2fsprogs builds on macOS. Change-Id: I4ddf332cc244fa44f928cba68470b7f9aa48a556 From AOSP commit: 4dc2456f0e6d10c73372e829e1875ec4095e8fa6
* AOSP: Always define HAVE_SYS_SYSMACROS_H on Android.David Anderson2018-08-051-1/+1
| | | | | | | | | | This is needed after 3fb715b55426875902dfef3056b2cf7335953178 which conditionally included sysmacros.h. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Change-Id: I52e3da4d9ea0f5efbf685a9c4a266f33357f8d8c From AOSP commit: a5deff7b7ee15a5ba5d65516326ce4c42daa1027
* Clean up util/android_config.hTheodore Ts'o2018-02-261-10/+2
| | | | | | Remove duplicate #defines and reorganize them to minimize excess Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* remove AOSP's lib/config.h and update util/android_config.hTheodore Ts'o2018-02-261-0/+7
| | | | | | | | | | | | While synchronizing with the AOSP e2fsprogs tree, lib/config.h was accidentally checked in. In the upstream repository, the official copy of lib/config.h for Android should be stored in util/android_config.h, since lib/config.h will confuse Unix builds. This means that when synchronizing with the AOSP tree, changes lib/config.h need to be reflected in util/android_config.h Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* AOSP: Define HAVE_SYS_SYSMACROS_H for Android.Elliott Hughes2017-05-231-0/+1
| | | | | | | | | | | Also remove a duplicate copy of misc/create_inode.c that isn't upstream. Bug: https://github.com/android-ndk/ndk/issues/398 Test: builds Change-Id: Ibc475c82aa21f063673cb68bcf6e41ad9d821cd3 From AOSP commit: 37f805a9571cf33c95080c3dbd65c7a4e46fcd71 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* AOSP: android: libext2fs and com_err for windowsAdrien Schildknecht2017-05-231-35/+37
| | | | | | | | | Test: m libext2fs-host && m libext2_com_err-host Change-Id: I92b6717b617a4f7f16182bf12af58cb22f20fa8f From AOSP commit: 1538eb4c580d53657f82e4e0170ca5ad5b67455c Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Fix windows and mac buildJin Qian2017-05-231-0/+6
| | | | | | | | | | malloc.h is not available on mac. mntent.h and setmntent are not available on windows. Test: cd external/e2fsprogs && mm Change-Id: I3bc1b80156d3659f4d81975626a71f58d39ee61a (cherry picked from commit 8ca6180b52349968daf601bd89e15491eb2f271f)
* AOSP: Fix "Can't use getmntent or getmntinfo to check for mounted ↵Elliott Hughes2017-05-231-4/+2
| | | | | | | | | | | | | | | | filesystems!" warning. We do have <mntent.h> and setmntent(3). Also silence unused parameter warnings; C programmers don't care, so upstream is unlikely to fix that. Bug: N/A Test: builds Change-Id: I57db0cca68a617913e21c2ef7b6613cd1183d7c5 From AOSP commit: d5947f70714e6676bca2663af210bfb9f6118e83 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* AOSP: libext2fs: android sparse io managerAdrien Schildknecht2017-05-231-0/+2
| | | | | | | | | | | | | Add a new io manager to directly output sparse images. Test: mke2fs [...] -E sparse_file; simg2img system.img system.ext4; e2fsck system.ext4 Change-Id: I41cf8c1b33d359be4f104e03fb4041863214843c From AOSP commit: f9e0f1d4a7cf32c4091eee7d2a1676cac1d17438 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* AOSP: Fix mac buildColin Cross2017-05-231-0/+8
| | | | | | | | | | | | | Disable linux-only features in config.h Fix one use of ino_t instead of ext2_ino_t. Test: mma -j Test: e2fsck -f -n $OUT/system.img Bug: 27599744 Change-Id: I3291ae888ac28a49813365ab2431a3c266de9907 From AOSP commit: bfa685deba9eb828b7ed35d6ccaf0345f6337ce3 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Fix Android build warningsTheodore Ts'o2016-05-291-0/+1
| | | | | | | Also fix some additional gcc -Wall build warnings in a traditional Linux environment. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Remove dropped const warning and enable pread/pwrite for Android buildTheodore Ts'o2015-07-131-0/+4
| | | | Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Eliminate unused variable and unused label warnings from Android buildTheodore Ts'o2015-07-131-0/+5
| | | | Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Eliminate unused parameter warnings from Android buildTheodore Ts'o2015-07-131-0/+2
| | | | Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* android_config: remove HAVE_TERMIO_HTheodore Ts'o2015-07-121-1/+0
| | | | | | | | | | Sync up with aosp's e2fsprogs commits: dc351db427e667b9f954c4338f69da83fa16222b 2ca3c65991609bb5b48004ec3c7a66f6b417beed 4ef951aa5e69116963f1836fe5ddcf6b87afbecd Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* configure: remove support to disable htree supportTheodore Ts'o2015-07-031-1/+0
| | | | | | | The presence of --disable-htree is very much a legacy thing. Remove it since supporting the lack of htree support is pretty silly. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Update Android build files so the 1.43 branch builds on AOSPTheodore Ts'o2015-05-251-0/+1
| | | | | | | Recent changes in the 1.43 branch as well as the latest AOSP caused the Android build to break; fix them. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Clean up and fix Android build filesTheodore Ts'o2015-03-301-0/+34
| | | | | | | | | Add missing new lib/ext2fs source files that were added for encryption support. Also move configuration #define's from individual Android.mk to the android_config.h file, since we've moved away from specifying configuration #define's on the command-line upstream. Signed-off-by: Theodore Ts'o <tytso@mit.edu>
* Add files to build on AndroidTheodore Ts'o2015-03-011-0/+7
The Android.mk files were taken from the Android AOSP sources, and updated for the 1.43 next branch. The intention is that this will allow the repository which is currently located in external/e2fsprogs with one which is based off of the upstream e2fsprogs. Right now external/e2fsprogs was not created using "git clone", so it means that git merges don't work. After the external/e2fsprogs Android repository is replaced, with one based off the upstream repository, Android will be able to synchronize with the upstream repository by pulling and merging from upstream, and then running the script "./util/gen-android-files" to update any generated files. (This is necessary because in the Android build system, the Android.mk files are rather stylized and don't make it easy to run arbitrary shell scripts during the build phase.) Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
View Lorry Controller Status