diff options
| -rw-r--r-- | applypatch/Android.mk | 12 | ||||
| -rw-r--r-- | applypatch/imgpatch.cpp | 2 | ||||
| -rw-r--r-- | res-xxhdpi/images/erasing_text.png | bin | 121386 -> 121608 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/error_text.png | bin | 85555 -> 84727 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/installing_security_text.png | bin | 387979 -> 447158 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/installing_text.png | bin | 355503 -> 415889 bytes | |||
| -rw-r--r-- | res-xxhdpi/images/no_command_text.png | bin | 148704 -> 243028 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/erasing_text.png | bin | 257605 -> 263768 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/error_text.png | bin | 173381 -> 176936 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/installing_security_text.png | bin | 620933 -> 610107 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/installing_text.png | bin | 581822 -> 567834 bytes | |||
| -rw-r--r-- | res-xxxhdpi/images/no_command_text.png | bin | 322613 -> 331159 bytes | |||
| -rw-r--r-- | tools/recovery_l10n/README.md | 3 |
13 files changed, 13 insertions, 4 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 85b5c9fcd..bdaef1b27 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -35,7 +35,9 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto \ libbz \ libz -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := \ + -DZLIB_CONST \ + -Werror include $(BUILD_STATIC_LIBRARY) # libimgpatch (static library) @@ -54,7 +56,9 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto \ libbz \ libz -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := \ + -DZLIB_CONST \ + -Werror include $(BUILD_STATIC_LIBRARY) # libimgpatch (host static library) @@ -74,7 +78,9 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto \ libbz \ libz -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := \ + -DZLIB_CONST \ + -Werror include $(BUILD_HOST_STATIC_LIBRARY) # libapplypatch_modes (static library) diff --git a/applypatch/imgpatch.cpp b/applypatch/imgpatch.cpp index ae6071f0e..00ea90efa 100644 --- a/applypatch/imgpatch.cpp +++ b/applypatch/imgpatch.cpp @@ -160,7 +160,7 @@ int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size, const Value strm.zfree = Z_NULL; strm.opaque = Z_NULL; strm.avail_in = src_len; - strm.next_in = const_cast<unsigned char*>(old_data + src_start); + strm.next_in = old_data + src_start; strm.avail_out = expanded_len; strm.next_out = expanded_source.data(); diff --git a/res-xxhdpi/images/erasing_text.png b/res-xxhdpi/images/erasing_text.png Binary files differindex 8e8dfc450..86693f435 100644 --- a/res-xxhdpi/images/erasing_text.png +++ b/res-xxhdpi/images/erasing_text.png diff --git a/res-xxhdpi/images/error_text.png b/res-xxhdpi/images/error_text.png Binary files differindex 7fd1983d5..9c4bcab95 100644 --- a/res-xxhdpi/images/error_text.png +++ b/res-xxhdpi/images/error_text.png diff --git a/res-xxhdpi/images/installing_security_text.png b/res-xxhdpi/images/installing_security_text.png Binary files differindex 9779927ef..f5ec698f8 100644 --- a/res-xxhdpi/images/installing_security_text.png +++ b/res-xxhdpi/images/installing_security_text.png diff --git a/res-xxhdpi/images/installing_text.png b/res-xxhdpi/images/installing_text.png Binary files differindex fa488960e..100a5b303 100644 --- a/res-xxhdpi/images/installing_text.png +++ b/res-xxhdpi/images/installing_text.png diff --git a/res-xxhdpi/images/no_command_text.png b/res-xxhdpi/images/no_command_text.png Binary files differindex d72a840e9..590030c8b 100644 --- a/res-xxhdpi/images/no_command_text.png +++ b/res-xxhdpi/images/no_command_text.png diff --git a/res-xxxhdpi/images/erasing_text.png b/res-xxxhdpi/images/erasing_text.png Binary files differindex 7c198176d..4cf5d76e8 100644 --- a/res-xxxhdpi/images/erasing_text.png +++ b/res-xxxhdpi/images/erasing_text.png diff --git a/res-xxxhdpi/images/error_text.png b/res-xxxhdpi/images/error_text.png Binary files differindex 4cd2a8cc4..8dd6f1236 100644 --- a/res-xxxhdpi/images/error_text.png +++ b/res-xxxhdpi/images/error_text.png diff --git a/res-xxxhdpi/images/installing_security_text.png b/res-xxxhdpi/images/installing_security_text.png Binary files differindex d84c5d9a9..fa06f3147 100644 --- a/res-xxxhdpi/images/installing_security_text.png +++ b/res-xxxhdpi/images/installing_security_text.png diff --git a/res-xxxhdpi/images/installing_text.png b/res-xxxhdpi/images/installing_text.png Binary files differindex ffe1474f9..d0f930160 100644 --- a/res-xxxhdpi/images/installing_text.png +++ b/res-xxxhdpi/images/installing_text.png diff --git a/res-xxxhdpi/images/no_command_text.png b/res-xxxhdpi/images/no_command_text.png Binary files differindex f4f13003b..233aec468 100644 --- a/res-xxxhdpi/images/no_command_text.png +++ b/res-xxxhdpi/images/no_command_text.png diff --git a/tools/recovery_l10n/README.md b/tools/recovery_l10n/README.md index 1554f6618..e9e85d65f 100644 --- a/tools/recovery_l10n/README.md +++ b/tools/recovery_l10n/README.md @@ -8,6 +8,9 @@ * For example, we can use Nexus 5 to generate the text images under res-xxhdpi. + * We can set up the maximum width of the final png image in res/layout/main.xml + Currently, the image width is 1200px for xxxhdpi, 900px for xxhdpi and + 480px for xhdpi/hdpi/mdpi. * When using the emulator, make sure the NDK version matches the current repository. Otherwise, the app may not work properly. |
