summaryrefslogtreecommitdiffstats
path: root/minui/Android.mk (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge AOSP android-9.0.0_r3Ethan Yonker2018-08-241-10/+16
|\ | | | | | | | | | | Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
| * libdrm_platform is now libdrmDan Willemsen2017-10-201-1/+1
| | | | | | | | | | | | | | Since it's converted to Soong and is using vendor_available. Test: mmma bootable/recovery Change-Id: I57b40c26abc2f6031241de893b3184ed1283e1fe
| * Build libminui with BOARD_VNDK_VERSIONJiyong Park2017-10-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | Use libdrm_platform which is a platform variant of libdrm. Bug: 63741047 Bug: 37342627 Test: BOARD_VNDK_VERSION=current m -j libminui Test: ryu recovery graphics test shows various graphics Change-Id: Ifd2c1432781a96538585cdf818aa728d628a2f5a Merged-In: Ifd2c1432781a96538585cdf818aa728d628a2f5a
| * Drop -Wno-unused-parameter.Tao Bao2017-10-121-0/+5
| | | | | | | | | | | | | | The only one left is libedify. Will handle that in a separate CL. Test: mmma bootable/recovery Change-Id: I732a5f85229da90fd767bee2e46c5c95f529c396
| * graphics: add rotation logicLuke Song2017-09-281-0/+6
| | | | | | | | | | | | | | Bug: 65556996 Bug: 63541890 Test: Tried 4 rotations, viewed logs and graphics test Change-Id: I2a6c18c28df03f0461663f63bf16db32c45211ec
| * Turn on -Wall for recovery modulesTianjie Xu2017-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Turn on -Wall for all modules. Also remove the obsolete file_cmp() in apply_patch test and now() in wear_ui. The only exception is lib_edify due to the unused functions in the intermediate cpp files generated from the lex files. It will be handled in a seperate CL. Bug: 64939312 Test: mma, unit tests pass Change-Id: Ic53f76b60b6401ab20db3d98130d674c08e3702f
* | Merge up to android-8.1.0_r1 and fix conflictsEthan Yonker2017-12-151-2/+5
|\ \ | | | | | | | | | Change-Id: I2dc060134d15ec9f015a606cb24ef8276f6af1fc
| * | Build libminui with BOARD_VNDK_VERSIONJiyong Park2017-07-211-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Use libdrm_platform which is a platform variant of libdrm. Bug: 63741047 Bug: 37342627 Test: BOARD_VNDK_VERSION=current m -j libminui Test: ryu recovery graphics test shows various graphics Change-Id: Ifd2c1432781a96538585cdf818aa728d628a2f5a Merged-In: Ifd2c1432781a96538585cdf818aa728d628a2f5a (cherry picked from commit a48c494f138ddb99320583d00120674be1e3297c)
| * Add the missing sr-Latn into png files and rename the png locale headerTianjie Xu2017-03-251-2/+8
| | | | | | | | | | | | | | | | | | | | | | Switch the locale header in the png files from Locale.toString() to Locale.toLanguageTag(). For example, en_US --> en-us and sr__#Latn --> sr-Latn. Also clean up recovery a bit to expect the new locale format. Bug: 35215015 Test: sr-Latn shows correctly under graphic tests && recovery tests pass Change-Id: Ic62bab7756cdc6e5f98f26076f7c2dd046f811db
* | minui: Do not overwrite previously set CFLAGSAndreas Schneider2017-11-291-2/+2
| | | | | | | | Change-Id: Ifa5bcffa12c045cb629974684882f1e0f56dcce6
* | Update to AOSP 8.0 baseEthan Yonker2017-09-081-4/+47
|\ \ | | | | | | | | | Change-Id: I29fe722b4eb9718765327902779046840a01433e
| * | Merge "Add the missing sr-Latn into png files and rename the png locale header" am: 713d915636 am: dc235b5ab9Tianjie Xu2017-03-291-2/+8
| |/ | | | | | | | | | | | | am: 5ec12126f0 Change-Id: Ia6b861c91958d3be23a4a7456d6d5d8e4a1607c8 (cherry picked from commit 9166f66eee883d6d6cc280a6c355e5528bb4a3f0)
| * minui: Export minui/minui.h.Tao Bao2017-01-171-7/+24
| | | | | | | | | | | | | | For libminui static and shared libraries. Test: build Change-Id: Ib30dc5e2ef4a3c8b3ca3a0cec68cb65e229a0c16
| * Turn on -Werror for recoveryTianjie Xu2016-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | Also remove the 0xff comparison when validating the bootloader message fields. As the fields won't be erased to 0xff after we remove the MTD support. Bug: 28202046 Test: The recovery folder compiles for aosp_x86-eng Change-Id: Ibb30ea1b2b28676fb08c7e92a1e5f7b6ef3247ab (cherry picked from commit 7aa88748f6ec4e53333d1a15747bc44826ccc410)
| * Recovery mode UI flickerxinglong.zhu2016-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [root cause ] miniui has no mechanism to protect the buffer which is displaying [changes ] recovery [side effects] ui show [self test ] sc9850-2 general operation has not display abnormal [reviewers ] xinglong.zhu Signed-off-by: xinglong.zhu <xinglong.zhu@spreadtrum.com> [change_type ] AOB --> google_original [tag_product ] common Change-Id: I989a0b2943ff6070a0e98718cfbe95144510d3a2
* | Fix minui issues for some build treesEthan Yonker2017-06-061-2/+3
| | | | | | | | | | | | | | | | In trees where TWRP is the primary recovery, minui.h was not setting rules properly for healthd because healthd uses clang. Must use CLANG_TARGET_GLOBAL_CFLAGS to set global flags. Change-Id: I4cd9c88f8fcaec345fe012d09abcb9f24be06ef4
* | Update TWRP to AOSP 7.1.2Ethan Yonker2017-05-101-0/+3
|\| | | | | | | Change-Id: I19c1546efb4182aac62c690e3cc05b04e3a9a32e
* | ifdef overlay graphicsEthan Yonker2017-01-211-2/+2
| | | | | | | | Change-Id: If3173ddbfaccb95cc48636240ee3a918dac1e23f
* | Update to 7.0Ethan Yonker2016-08-241-0/+1
|\| | | | | | | Change-Id: I621cc47352f7ac552d9602485825ae3a6f9ae516
| * am 8409b088: Merge "Add drm support to minui" into mnc-devVincent Palatin2015-07-021-0/+2
| |\ | | | | | | | | | | | | * commit '8409b08888d5ec914d7b4aae552bc78f23bcddd5': Add drm support to minui
| * | recovery: Switch to clangTao Bao2015-06-031-0/+1
| | | | | | | | | | | | | | | | | | And a few trival fixes to suppress warnings. Change-Id: I38734b5f4434643e85feab25f4807b46a45d8d65
* | | minui: bring back custom font supportmaxwen2015-12-011-1/+3
| | | | | | | | | | | | Change-Id: I6cb97b236ff8ada46d270e99ab37656f5f1b73f8
* | | Add support for RGBA_8888 pixel formatKra1o52015-10-141-0/+3
| | | | | | | | | | | | Change-Id: Ia15d49e51cad5bc8a3291975e1ff515a2b1c419c
* | | Add qcom overlay graphics support to minuiEthan Yonker2015-10-141-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | graphics_overlay.cpp is based on a mix of AOSP code for graphics_fbdev.cpp along with overlay graphics code from CAF that was brought into earlier versions of TWRP and then further adapted and improved before being brought into this patch set. Also added a rule to build a minuitest binary for testing the minui engine to ensure proper operation on a device. Change-Id: I3972d3a6baa7002615319421ac07d9299c3cec69
* | | Merge up to AOSP marshmallow-releaseEthan Yonker2015-10-091-81/+20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to maintain compatibility with older trees, we now have minadbd.old and minui.old. I had to use a TARGET_GLOBAL_CFLAG to handle ifdef issues in minui/minui.d because healthd includes minui/minui.h and there was no other alternative to make minui.h compatible with older trees without having to modify healthd rules which is outside of TWRP. Note that the new minui does not currently have support for qcom overlay graphics. Support for this graphics mode will likely be added in a later patch set. If you are building in a 6.0 tree and have a device that needs qcom overlay graphics, be warned, as off mode charging may not work properly. A dead battery in this case could potentially brick your device if it is unable to charge as healthd handles charging duties. Update rules for building toolbox and add rules for making toybox Use permissive.sh in init.rc which will follow symlinks so we do not have to worry about what binary is supplying the setenforce functionality (toolbox, toybox, or busybox). Fix a few warnings in the main recovery binary source code. Fix a few includes that were missing that prevented compiling in 6.0 Change-Id: Ia67aa2107d260883da5e365475a19bea538e8b97
| * | Add drm support to minuiStéphane Marchesin2015-07-021-0/+2
| |/ | | | | | | | | | | | | Bug: 22231636 Change-Id: I103c8e906b7dd9862b7bb89d8642268e9a3006b4 Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
| * Switch minui over to C++.Elliott Hughes2015-04-101-4/+4
| | | | | | | | Change-Id: I59e08a304ae514a3fdb6fab58721f11670bc1b01
| * Add ev_iterate_available_keys to minui.Elliott Hughes2015-04-101-2/+7
| | | | | | | | | | | | | | This lets us recognize whether we have up/down/power, say, and tailor the UI accordingly. Change-Id: If94e454f14243b59d2f473ac9a436bd60591da01
| * Fix recovery image text rendering.Elliott Hughes2015-03-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously most devices would lose the character before a line wrap. The log's text rendering was starting at offset 4 but none of the arithmetic was taking this into account. It just happened to work on the Nexus 9's 1536-pixel wide display (1536/18=85.3) but not on a device such as the Nexus 5 (1080/18=60). The only active part of this change is the change from 4 to 0 in the gr_text call. The rest is just a few bits of trivial cleanup while I was working out what was going on. Change-Id: I9279ae323c77bc8b6ea87dc0fe009aaaec6bfa0e
| * Drop hardcoded LOCAL_C_INCLUDES from minui/Android.mkTrevor Drake2015-02-261-4/+1
| | | | | | | | | | | | | | The zlib include was not required. libpng is now handled by referencing the libpng static library Change-Id: Ie4e0abad3fff5b763eba363d3d0fa96128ff49bc
| * Fix Droid and animation color in recovery modeTony Kuo2015-02-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [Problem] Droid and animation color in recovery mode are incorrect [Modify] - Add support for flipping (zero copy) with RECOVERY_ABGR. - Decodes PNG files to BGRA directly, and other fills, text and alpha blending are also done directly in BGRA (i.e. blits can still bypass conversion) - Remove the BGRA workaround added previous for single buffer mode (f766396) Bug:19216535 Change-Id: Ie864419fc6da776ff58b2d02e130f203c194500f Signed-off-by: Tony Kuo <tony.kuo@mediatek.com>
| * recovery: Generate libminui dynamic libraryAjay Dudani2015-02-111-0/+7
| | | | | | | | | | | | | | Allow factory test images to use minui functionaltiy by making use of libminui dynamic library. Change-Id: I63e77420d5addbcc6eebeedc213f629085766b4c
* | minui: add BOARD_USE_CUSTOM_RECOVERY_FONTmaxwen2015-07-161-1/+6
| | | | | | | | | | | | we want to use it in charger Change-Id: I3e0288b074bd7203214d218aaee69cb4798e9531
* | Add option to use new heap_id_mask instead of old heap_maskKra1o52015-04-231-0/+4
| | | | | | | | | | | | Use TW_NEW_ION_HEAP := true to use it Change-Id: I2ad105fa6d122b460ed4b5dc78563077b7904567
* | Add support for custom kernel headersKra1o52014-12-171-2/+10
| | | | | | | | Change-Id: I39fe4de8919e59dd75e8cb535fa0648948035c26
* | Fix up old libminui to compileEthan Yonker2014-11-071-2/+4
| | | | | | | | | | | | | | | | | | Implement some needed updates to libminui to make it compile for healthd. Note that res_create_multi_display_surface is not fully implemented so healthd may still have issues with displaying some graphics. Will update later when we are able to test these changes. Change-Id: Ic1095a998f5dfe7e36a08384c86da28e0524a03f
* | Revert to old libminui and fix upEthan Yonker2014-11-061-5/+2
| | | | | | | | | | | | | | | | We will wait for CAF to give us a new libminui that supports qualcomm overlay before moving up to the new format if possible. Attempt to fix up old libminui to work with new libpng. Change-Id: I494b7287b347f4730aa8f9d27d4cc17b6e93919a
* | Merge in lollipop and attempt to fix merge conflictsEthan Yonker2014-11-061-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will probably not compile and may need additional work. For tracking purposes so we know what might still need looking at as none of this has been compiled and tested, here is a list of the merge conflicts that I attempted to fix before pushing this set of changes: git pull aosp lollipop-release remote: Finding sources: 100% (992/992) remote: Total 992 (delta 473), reused 992 (delta 473) Receiving objects: 100% (992/992), 1.51 MiB | 516.00 KiB/s, done. Resolving deltas: 100% (473/473), completed with 42 local objects. From https://android.googlesource.com/platform/bootable/recovery * branch lollipop-release -> FETCH_HEAD * [new branch] lollipop-release -> aosp/lollipop-release Auto-merging verifier_test.cpp CONFLICT (content): Merge conflict in verifier_test.cpp Auto-merging verifier.h CONFLICT (content): Merge conflict in verifier.h Auto-merging verifier.cpp CONFLICT (content): Merge conflict in verifier.cpp Auto-merging updater/updater.c Auto-merging updater/install.c CONFLICT (content): Merge conflict in updater/install.c Auto-merging updater/Android.mk CONFLICT (content): Merge conflict in updater/Android.mk Auto-merging uncrypt/Android.mk CONFLICT (content): Merge conflict in uncrypt/Android.mk Auto-merging ui.cpp CONFLICT (content): Merge conflict in ui.cpp Auto-merging screen_ui.cpp Auto-merging roots.cpp CONFLICT (content): Merge conflict in roots.cpp CONFLICT (rename/delete): res-hdpi/images/progress_fill.png deleted in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42. Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of res-hdpi/images/progress_fill.png left in tree. CONFLICT (rename/delete): res-hdpi/images/progress_empty.png deleted in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42. Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of res-hdpi/images/progress_empty.png left in tree. CONFLICT (rename/delete): res-hdpi/images/icon_error.png deleted in HEAD and renamed in cddb68b5eafbeba696d5276bda1f1a9f70bbde42. Version cddb68b5eafbeba696d5276bda1f1a9f70bbde42 of res-hdpi/images/icon_error.png left in tree. Auto-merging recovery.cpp CONFLICT (content): Merge conflict in recovery.cpp Auto-merging minui/resources.c CONFLICT (content): Merge conflict in minui/resources.c Auto-merging minui/minui.h CONFLICT (content): Merge conflict in minui/minui.h Auto-merging minui/graphics.c CONFLICT (content): Merge conflict in minui/graphics.c Auto-merging minui/Android.mk CONFLICT (content): Merge conflict in minui/Android.mk Removing minelf/Retouch.h Removing minelf/Retouch.c Auto-merging minadbd/usb_linux_client.c CONFLICT (content): Merge conflict in minadbd/usb_linux_client.c Auto-merging minadbd/adb.h CONFLICT (content): Merge conflict in minadbd/adb.h Auto-merging minadbd/adb.c CONFLICT (content): Merge conflict in minadbd/adb.c Auto-merging minadbd/Android.mk CONFLICT (content): Merge conflict in minadbd/Android.mk Removing make-overlay.py Auto-merging install.h CONFLICT (content): Merge conflict in install.h Auto-merging etc/init.rc CONFLICT (content): Merge conflict in etc/init.rc Auto-merging bootloader.h Auto-merging applypatch/applypatch.c Auto-merging applypatch/Android.mk CONFLICT (content): Merge conflict in applypatch/Android.mk Auto-merging adb_install.cpp CONFLICT (content): Merge conflict in adb_install.cpp Auto-merging Android.mk CONFLICT (content): Merge conflict in Android.mk Automatic merge failed; fix conflicts and then commit the result. Change-Id: I3e0e03e48ad8550912111c7a5c9a140ed0267e2c
| * recovery: minui: add adf backendGreg Hackmann2014-04-261-1/+4
| | | | | | | | | | Change-Id: I1ad97b5b62bddbcb1104fa0b4e54415b793a4194 Signed-off-by: Greg Hackmann <ghackmann@google.com>
| * separate fbdev-specific code out from minuiDoug Zongker2014-03-111-1/+1
| | | | | | | | | | | | | | Isolate the code that interacts with fbdev, in preparation for adding a new backend. Change-Id: I19105e9da1ca6408cebc110f7e2bb5abfb481ee9
* | Build block TWRP with RECOVERY_VARIANTMatt Mower2014-09-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Enable TWRP to reside alongside other recoveries with the naming convention: bootable/recovery(-flag). If TWRP resides at bootable/recovery and a device does not specify RECOVERY_VARIANT, then it will build like normal. If TWRP resides at bootable/recovery-twrp, then its makefiles will only be parsed if a device specifies 'RECOVERY_VARIANT := twrp'. This prevents TWRP specific makefile warnings/errors (notably, missing DEVICE_RESOLUTION) when another recovery is being built. Change-Id: I8f02fffcd79c309c7123b9428eedc69af02e126e
* | Update minui to support overlay graphicsDees Troy2014-05-021-1/+76
| | | | | | | | | | | | Fix path in minuitwrp for includes Change-Id: I9e9e5f67e8574cdcbc6f8873ceeb56eab71143ed
* | minui: adapt backlight blanking commit to TWRPMatt Mower2014-02-061-2/+10
| | | | | | | | Change-Id: I79417d218c84fcdaf2ce5ecdf314031831d89575
* | minui: Allow devices to blank/unblank using LCD backlightEthan Chen2014-02-031-0/+4
| | | | | | | | | | | | | | * Some devices rely on the LCD backlight to blank/unblank the display, support them by allowing a custom LCD backlight path to be used. Change-Id: I8406b4b55cd7a2afc4f8f8ba65de2c53b949489d
* | Support custom graphics.c.Koushik Dutta2013-12-121-1/+6
| | | | | | | | | | | | | | TWRP does not use this, but is needed for other things that depend on it like charger. Change-Id: Ic7d10e8230151bcc4be6cfa222a1e07231e7139f
* | Update to latest AOSP masterDees_Troy2013-09-041-2/+12
|\| | | | | | | Merge in latest commits from AOSP master and fix merge conflicts
| * add optional overscan compensation to recovery graphicsDoug Zongker2012-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | If your screen is a TV, it may not actually be displaying the edges of the framebuffer. Allow specifying an overscan percentage, and move each edge of the framebuffer in by that percent of the width/height. (The gr_* layer just lies to the caller about the size of the framebuffer, telling the caller it's smaller than it really is, and offsets all drawing commands to match.) Change-Id: I11bb2feb39ae522bd3e957a14ebdecf3609e0fdc
| * allow double-quotes or not in TARGET_RECOVERY_PIXEL_FORMATDoug Zongker2012-07-111-2/+6
| | | | | | | | Change-Id: I0bf22c87c51a34ee4a839c4966277fad8150bd59
* | TWRP-ify AOSP codeDees_Troy2012-09-051-1/+1
|/ | | | | | | Pull in most TWRP sources Stub out partition management code Make it compile -- probably will not boot Kind of a mess but have to start somewhere
* Graphics can handle stride != xres, and BGRA support.Michael Ward2011-06-231-2/+5
| | | | Change-Id: Ifee94ac08028e62a40241a089ac7c36346fea3a3
* option to allow recovery to use 24-bit graphics in UIDoug Zongker2011-01-141-0/+4
| | | | | | | Add "RECOVERY_24_BIT := true" to the device's BoardConfig.mk to use 24-bit framebuffers in the recovery ui. Change-Id: Iaede138bf7870becf237f12f1c0e49c9ff82d007
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-041-0/+12
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-041-12/+0
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+12