Commit Graph
7512 Commits
Author SHA1 Message Date
Ethan Yonker ec0fa4ad68 Properly set tw_settings_path after decrypt on data media devices
When tw_settings_path is not set correctly for /data/media/0 when
present, custom themes will not load (and who knows what else may
also be broken) so set it properly after decrypting the device.

Change-Id: Id3dff04f62cf9c953c8a2ca07fe9ac597dcda20f
2014-11-20 09:51:06 -06:00
Dees Troy c8f58997e2 Fix process to disable stock recovery flashing
/system/etc/install-recovery.sh no longer exists on AOSP devices
so we will stop checking for it.

Change-Id: I9074dfc443371a27b909faa8f66998683cfb6171
2014-11-20 15:29:17 +00:00
Ethan Yonker 2b556013bf Add /firmware to the mount list for L decrypt
Needed by Nexus 6 and possibly others

Change-Id: I3309e2141a21a94dce90e34cced16450b591a92c
2014-11-19 16:15:21 -06:00
Ethan Yonker 0e67837dd0 Add flag for including additional files built from source in TWRP
Some devices may need additional binaries or libs that TWRP
normally does not need included in /sbin
Use TW_RECOVERY_ADDITIONAL_RELINK_FILES to build them from source
and get them added to the recovery ramdisk.
For example, Nexus 9 needs libc++ included in order to decrypt
the data partition. The following will build it from source and
include it in TWRP:
TARGET_RECOVERY_DEVICE_MODULES := libc++
TW_RECOVERY_ADDITIONAL_RELINK_FILES := \
    out/target/product/volantis/system/lib/libc++.so

Change-Id: I147c0d5569c83514d2e50226ecc50e80bf8aac36
2014-11-18 12:17:10 -06:00
Ethan Yonker cceebb8189 Tweak 5.0 L decrypt
Mount the vendor partition if it exists so we can use any
proprietary files we may need.
Relocate auto decrypt when default_password is in use to after all
partitions are added so that we can mount the vendor partition.

Change-Id: I93455a35695779f53ef57a82d3d45c7216c13639
2014-11-18 10:18:14 -06:00
Ethan Yonker 560e65f899 Make libmincrypttwrp a shared library
Change-Id: I8c3f084fc34b00edb4cd1b652290df8bc80ea1db
2014-11-17 11:37:20 -06:00
Ethan Yonker 03ea978f63 Clean up make flash utility make files
Change-Id: Ie396be7d9636a8b481bcf7c062f94ce51a4b1fde
2014-11-17 09:36:46 -06:00
The Android Automerger 5cd8a8abfd merge in lmp-mr1-release history after reset to lmp-mr1-dev 2014-11-17 06:09:17 -08:00
bigbiff 85939e5a1b Thanks to _that, return null if vector is empty
Change-Id: Idc44455dd0c971c876ae283528c4367a82e145bd
2014-11-15 21:07:22 -05:00
Heather Lee Wilson f3958d07a3 am 71fa5392: am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode
* commit '71fa5392439bf7ec55bda58924d3180539f80972':
  Byte swap to support BGRA in recovery mode
2014-11-15 16:41:54 +00:00
Heather Lee Wilson 71fa539243 am de27d4cb: am e5879c36: Byte swap to support BGRA in recovery mode
* commit 'de27d4cbb75a9c2f5ad0fc24edf5295d0f3d9fe0':
  Byte swap to support BGRA in recovery mode
2014-11-15 16:32:22 +00:00
Heather Lee Wilson de27d4cbb7 am e5879c36: Byte swap to support BGRA in recovery mode
* commit 'e5879c3639789d61803605c12371a4f291e0b3cc':
  Byte swap to support BGRA in recovery mode
2014-11-14 20:26:51 +00:00
Heather Lee Wilson e5879c3639 Byte swap to support BGRA in recovery mode
Fixes color palate of recovery mode when double buffer enabled.

Bug: 18169447
Change-Id: Ia50b0fb9afd8001dfd740c09ce109fa421e691f7
2014-11-14 12:00:18 -08:00
Yabin Cui 84b2cbee2a am 82ca0ba8: am 92242c70: Merge "kill HAVE_FORKEXEC"
* commit '82ca0ba805307f2c8bf4a3abb03fd7e1b5213ccb':
  kill HAVE_FORKEXEC
2014-11-14 00:47:19 +00:00
Yabin Cui 82ca0ba805 am 92242c70: Merge "kill HAVE_FORKEXEC"
* commit '92242c704846f28932e555dba800f4a701063896':
  kill HAVE_FORKEXEC
2014-11-13 19:10:18 +00:00
Yabin Cui 92242c7048 Merge "kill HAVE_FORKEXEC" 2014-11-13 18:14:54 +00:00
Yabin Cui 678f7d4a36 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: Idd4e0effa96752e2c0ca959728f80df4d2d34187
2014-11-12 16:51:45 -08:00
Ethan Yonker 4eca40d7d8 Add lollipop decrypt support
Kang in cryptfs.c and cryptfs.h from vold.
Use TW_INCLUDE_L_CRYPTO := true to enable.
Ramdisk must contain the normal fstab file in the root in the
usual format of:
fstab.{ro.hardware}
For examble for Nexus 5:
fstab.hammerhead
Or on many Qualcomm devices:
fstab.qcom

Tested against Android 5.0 lollipop on Nexus 7 2012 grouper. Not
sure if or how this will work when we are dealing with a device
with a hardware keystore. Long term we need to add a GUI element
to allow entering a pattern. For now you can decrypt a pattern
unlock by converting the dots to numbers in the following format:
123
456
789

So an upper-case L would translate to 14789 as a password entered
on the keyboard.

Change-Id: I02c29e1f1c2eb29bf002c9fe0fc118357300b5b3
2014-11-12 18:07:24 +01:00
Ethan Yonker bcc502cff9 Make TWRP compile for arm64
-Remove dosfstools for arm64 until we can make it compile
-Fix TW_USE_TOOLBOX flag to work again
-Fix symlinking and handling of sh when using mksh
-Fix legacy properties to find futex_wake function
-Fix libcrecovery to not use bsd_signal anymore
-Fix rules for building with regards to libcrecovery
-Update toolbox_recovery rules to compile tools in lollipop
-Fix a few compile errors specific to arm64

Testers report that TWRP does not boot on Nexus 9 and we fail to
get a shell for adb shell. At least it compiles without errors.

Change-Id: I286be8628defb60cc527b8a548c0bdfcb0ebb574
2014-11-12 11:03:50 -06:00
bigbiff 4e36d50b06 update theme thanks to Alexey71 on xda.
Change-Id: Id5a0d40d05b0d7e56fb3e8f0578c201957508b70
2014-11-11 20:28:39 -05:00
Ethan Yonker 6c41bfd2f3 Fix openaes
timeb was removed from bionic so include the necessary code in
libopenaes as needed to make it work again.

Change-Id: Idf9eea4e09c7f149a53ed3e952feea0c6674cea6
2014-11-08 15:12:28 -06:00
Ethan Yonker a2dc2f22d0 Make custom themes work again
Change-Id: Ib9ad011428603979f7dd8a2708989feb9b13e075
2014-11-08 08:13:40 -06:00
The Android Automerger 2b1bb9b631 merge in lmp-mr1-release history after reset to 2020564f21 2014-11-08 06:09:38 -08:00
Ethan Yonker f9796a4a5f Release map after zip install
Change-Id: I4ae145669786ad0932297ae0ae095cbc6f3f696b
2014-11-08 07:28:03 -06:00
Ethan Yonker c30edd12c5 Fix potential tree conflicts with scrypt
Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc
2014-11-08 07:05:47 -06:00
Ethan Yonker 24813426b9 Update adb sideload feature
Change-Id: Ib503d0e87434e1a28430779302d6565211c26592
2014-11-07 17:25:46 -06:00
Ethan Yonker 57e3587b8e Fix zip install
We never used the feature for running a custom theme during zip
install. We can re-implement this later if we like. For now, we
will remove this feature until we are ready to make it work.

Change-Id: Ice71b0b863c7ef17376e3f973d48b810be567c33
2014-11-07 14:54:20 -06:00
Ethan Yonker 5a95c3ff41 Disable custom theme and fix png loading
We will have to update the zip handling later. Now at least TWRP
boots up to the GUI.

Change-Id: I4182896eb095cab52fb0f1c9c20b6605e35677b9
2014-11-07 13:33:07 -06:00
Ethan Yonker 67eb72ae4d Add new needed libs for 5.0 recovery
Change-Id: I9444e50b32517aebeca5ff3644c1c2f0dfff9d29
2014-11-07 10:44:37 -06:00
Ethan Yonker f96087e68f Fix up install functions
Change-Id: I62110806f60cd923fb761f5e5f2544da3d5b68b1
2014-11-07 10:38:51 -06:00
Ethan Yonker d7f2092ea0 Fix up tw_reboot function
Change-Id: I53d329e493f4bcb3fe9ed177e7b2dede30ccf490
2014-11-07 10:33:08 -06:00
Ethan Yonker c376ac8d9c Fix merge derp in main Android.mk file
Change-Id: Id6fcae7b7b8d9a03ff09711844e987084bd001ac
2014-11-07 10:23:52 -06:00
Ethan Yonker bad4e5f50d Fix up libminadbd make file
Change-Id: I216d59abf9a2e3d074bcbce9ad10f9dd84a2d463
2014-11-07 10:19:20 -06:00
Ethan Yonker 304f32fa98 Fix up old libminui to compile
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
2014-11-07 10:14:08 -06:00
Adrien Grassein 3cd669fd5d Fix build when TARGET_USERIMAGES_USE_EXT4 is not defined
The cryptfs.h files is always included, but its path is only included when TARGET_USERIMAGES_USE_EXT4 is defined.

Change-Id: Iec6aa4601a56a1feac456a21a53a08557dc1d00d
2014-11-07 08:30:41 +01:00
Dees Troy f171e103a8 Revert "Make libminuitwrp compile"
This reverts commit a27d02fab9.

Change-Id: I62d143044749f101cd70fef048057f896e46c208
2014-11-06 22:20:20 +01:00
Rob 12f1187e7f Recovery: Fix my-dir must be called before including any other makefile
Change-Id: I70c867961ae779bd99839e4ce7cb1dc8d154158f
2014-11-06 22:16:31 +01:00
Ethan Yonker a33161b020 Revert to old libminui and fix up
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
2014-11-06 15:11:23 -06:00
Ethan Yonker a27d02fab9 Make libminuitwrp compile
Odds are this is horribly broken, but we are not able to work on
it just yet.

Change-Id: I8cd12a6dba7957b1ccc1275b8d72c24797856db0
2014-11-06 10:24:42 -06:00
Ethan Yonker 26860098e8 Fix up libaosprecovery
Change-Id: I5a6d0c3c5f9a3a474464c0f06d6b09045459eebb
2014-11-06 09:49:25 -06:00
Ethan Yonker 6029e934f4 Fix some includes that are not longer present
Change-Id: Ic9509b0dc7f71ae64f64cc891868a2543eee4321
2014-11-06 09:31:48 -06:00
Ethan Yonker 1702eb44fc More make file tweaks
Change-Id: I26fa571b151c50d133b550395576d4e0246e18bd
2014-11-06 09:16:16 -06:00
Ethan Yonker c5717479dc Remove libcorkscrew
Change-Id: Ib93b934c6154a0a8955eb66c1bb0eed8aff10e34
2014-11-06 09:07:40 -06:00
Ethan Yonker 1e4a1994ce Update libmincrypttwrp
Change-Id: I90370cd8ef6d9f1be16adba51f51342827a04415
2014-11-06 09:05:01 -06:00
Ethan Yonker 0558775264 Fix some make file duplicates
Change-Id: Id226b2cde93cf0f81a6dd33fbdf70f8f954cade8
2014-11-06 08:54:25 -06:00
Ethan Yonker a167416289 Merge in lollipop and attempt to fix merge conflicts
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 cddb68b5ea.
Version cddb68b5ea 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 cddb68b5ea.
Version cddb68b5ea 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 cddb68b5ea.
Version cddb68b5ea 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
2014-11-06 08:35:13 -06:00
The Android Automerger 537d741e17 merge in lmp-mr1-release history after reset to 2020564f21 2014-11-06 06:09:58 -08:00
Ethan Yonker 9fdd034170 2.8.2.0
Change-Id: I8d689db9c8bf5ff6c5175ee9185e89ab72a1a2fd
2014-11-06 07:55:24 -06:00
The Android Automerger 282cabbde2 merge in lmp-mr1-release history after reset to 2020564f21 2014-11-05 06:09:44 -08:00
Matt Mower db22044901 Fix some module tags
There is no LOCAL_MODULES_TAGS. Fix by combining with LOCAL_MODULE_TAGS.

Change-Id: I1cacef2f8123af3632ff6a52aa62c2f2e15ac37d
2014-11-04 08:49:09 -06:00