diff options
| author | Elliott Hughes <enh@google.com> | 2017-03-27 23:02:40 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2017-03-29 16:16:57 -0700 |
| commit | 9263620f120864fca197eed32229c9bca5ec0098 (patch) | |
| tree | b645e6aebfbb218568156e090c941dc07290556f | |
| parent | ffc66c6e729f824398a0128b7c936f688ae8b884 (diff) | |
| download | toybox-9263620f120864fca197eed32229c9bca5ec0098.tar.gz | |
Use external/bzip2 for bunzip2 and bzcat.
external/bzip2 also gives us bzip2.
Bug: http://b/36653808
Test: builds
(cherry picked from commit 7602ee6309a07187392f1b686bfcad00ade886a0)
Change-Id: I7ca8b0524a56772681232352a8124a5acf520025
| -rw-r--r-- | .config | 5 | ||||
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | generated/config.h | 10 | ||||
| -rw-r--r-- | generated/flags.h | 12 |
4 files changed, 15 insertions, 14 deletions
@@ -23,6 +23,7 @@ CONFIG_TOYBOX_LIBCRYPTO=y # CONFIG_TOYBOX_MUSL_NOMMU_IS_BROKEN is not set CONFIG_TOYBOX_NORECURSE=y CONFIG_TOYBOX_ON_ANDROID=y +# CONFIG_TOYBOX_PEDANTIC_ARGS is not set CONFIG_TOYBOX_SELINUX=y # CONFIG_TOYBOX_SHADOW is not set # CONFIG_TOYBOX_SMACK is not set @@ -45,8 +46,8 @@ CONFIG_BLKID=y CONFIG_BLOCKDEV=y # CONFIG_BOOTCHARTD is not set # CONFIG_BRCTL is not set -CONFIG_BUNZIP2=y -CONFIG_BZCAT=y +# CONFIG_BUNZIP2 is not set +# CONFIG_BZCAT is not set CONFIG_CAL=y # CONFIG_CATV is not set CONFIG_CAT_V=y @@ -87,7 +87,6 @@ common_SRC_FILES := \ toys/other/base64.c \ toys/other/blkid.c \ toys/other/blockdev.c \ - toys/other/bzcat.c \ toys/other/chcon.c \ toys/other/chroot.c \ toys/other/clear.c \ @@ -256,7 +255,6 @@ ALL_TOOLS := \ base64 \ basename \ blockdev \ - bzcat \ cal \ cat \ chcon \ diff --git a/generated/config.h b/generated/config.h index 5fb4ecdc..8936220e 100644 --- a/generated/config.h +++ b/generated/config.h @@ -32,6 +32,8 @@ #define USE_TOYBOX_NORECURSE(...) __VA_ARGS__ #define CFG_TOYBOX_ON_ANDROID 1 #define USE_TOYBOX_ON_ANDROID(...) __VA_ARGS__ +#define CFG_TOYBOX_PEDANTIC_ARGS 0 +#define USE_TOYBOX_PEDANTIC_ARGS(...) #define CFG_TOYBOX_SELINUX 1 #define USE_TOYBOX_SELINUX(...) __VA_ARGS__ #define CFG_TOYBOX_SHADOW 0 @@ -64,10 +66,10 @@ #define USE_BOOTCHARTD(...) #define CFG_BRCTL 0 #define USE_BRCTL(...) -#define CFG_BUNZIP2 1 -#define USE_BUNZIP2(...) __VA_ARGS__ -#define CFG_BZCAT 1 -#define USE_BZCAT(...) __VA_ARGS__ +#define CFG_BUNZIP2 0 +#define USE_BUNZIP2(...) +#define CFG_BZCAT 0 +#define USE_BZCAT(...) #define CFG_CAL 1 #define USE_CAL(...) __VA_ARGS__ #define CFG_CATV 0 diff --git a/generated/flags.h b/generated/flags.h index 2103e10f..02181795 100644 --- a/generated/flags.h +++ b/generated/flags.h @@ -127,7 +127,7 @@ #undef FOR_brctl #endif -// bunzip2 cftkv cftkv +// bunzip2 cftkv #undef OPTSTR_bunzip2 #define OPTSTR_bunzip2 "cftkv" #ifdef CLEANUP_bunzip2 @@ -3299,11 +3299,11 @@ #ifndef TT #define TT this.bunzip2 #endif -#define FLAG_v (1<<0) -#define FLAG_k (1<<1) -#define FLAG_t (1<<2) -#define FLAG_f (1<<3) -#define FLAG_c (1<<4) +#define FLAG_v (FORCED_FLAG<<0) +#define FLAG_k (FORCED_FLAG<<1) +#define FLAG_t (FORCED_FLAG<<2) +#define FLAG_f (FORCED_FLAG<<3) +#define FLAG_c (FORCED_FLAG<<4) #endif #ifdef FOR_bzcat |