Commit Graph

9577 Commits

Author SHA1 Message Date
Ying Wang c43b17f0ad Merge "Fix recovery image build for 32p" 2014-12-01 23:59:21 +00:00
Bruce Beare 4c3c7a962f Fix recovery image build for 32p
When building for 32p, we need to be explicit that we wish to build
the 32bit version of the binaries that will be placed in the recovery
image. The recovery image doesn't actually care... but if we are not
explicit in this, the makefiles will ask for the 64bit binaries but the
Android.mk for the binaries will supply the 32bit images (causing the
build to fail).

Change-Id: Iea2d5f412740c082795da4358765751138a4b167
2014-11-30 19:21:19 -08:00
The Android Automerger d1c357fbae merge in lmp-mr1-release history after reset to lmp-mr1-dev 2014-11-27 06:09:56 -08:00
Ethan Yonker cdc3ef5feb TWRP MTP: make sure inotify_fd is set
Originally the inotify_init() call was part of a separate thread
which would occasionally allow the readDirs function to run and
start trying to add watches before inotify_fd was init'ed properly
and result in the add watch failing. This patch set relocates the
inotify_init call to happen outside and before starting the
separate thread to ensure that inotify_fd is set properly.

Change-Id: I8748c23473b60b57887df9d692834f3d2b249802
2014-11-25 15:00:08 -06:00
Dan Albert a01ce3a229 Start losing code to libadb.
Bug: 17626262
Change-Id: I8ce7cff2b7789f39f35a4211d7120d072c05a863
2014-11-25 10:59:42 -08:00
Michael Runge e7b0f60883 am 0fe938c0: am 5b9c4ce5: am b278c252: Add support for tune2fs file operations
* commit '0fe938c0fbebfdd3f6dedb0761588a20e741c870':
  Add support for tune2fs file operations
2014-11-24 18:18:43 +00:00
Michael Runge 0fe938c0fb am 5b9c4ce5: am b278c252: Add support for tune2fs file operations
* commit '5b9c4ce5a15bb76919e1556ae59993e9c310c0bc':
  Add support for tune2fs file operations
2014-11-24 18:06:43 +00:00
Michael Runge 5b9c4ce5a1 am b278c252: Add support for tune2fs file operations
* commit 'b278c252e148798346f85fc92eeea6afeb33fbf0':
  Add support for tune2fs file operations
2014-11-24 02:37:03 +00:00
Michael Runge acf47db238 Add support for tune2fs file operations
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition

Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
2014-11-21 21:10:20 -08:00
Michael Runge 4b54239173 Force write to disk while doing uncrypt
This should reduce errors if the device reboots before the blocks
are commited to disk.

Bug: 18481902

Change-Id: I13cda1c78955e4c83522fbcf87ddb16cc9f97683
2014-11-21 16:27:28 -08:00
Michael Runge b278c252e1 Add support for tune2fs file operations
This allows tune2fs to be executed from within OTA scripts,
allowing for file system modifications without formatting the
partition

Bug: 18430740
Change-Id: I0c2e05b5ef4a81ecea043e9b7b99b545d18fe5e6
2014-11-21 13:02:03 -08:00
Dan Albert db1044ab6b am 39be2f64: am d34b6378: Merge "Global C++11 compatibility."
* commit '39be2f64fdcfe4aded40fa83a4b212bb8a5de1e3':
  Global C++11 compatibility.
2014-11-20 23:18:56 +00:00
Dan Albert 39be2f64fd am d34b6378: Merge "Global C++11 compatibility."
* commit 'd34b63780eaf80ba71279360dc1e2fdbdc488eec':
  Global C++11 compatibility.
2014-11-20 23:00:40 +00:00
Dan Albert d34b63780e Merge "Global C++11 compatibility." 2014-11-20 21:21:14 +00:00
Dan Albert 32f9fe7fab Global C++11 compatibility.
Our build system compiles flex/bison as C++ rather than C, but a few
projects add `-x c` to their flags, forcing the compiler to compile
them as C. This causes the compiler to reject the global C++ standard
flag, so we need to explicitly provide a C standard flag to override
it.

Bug: 18466763
Change-Id: Id68ad9317261ed4d857a949b07288bd137ff6303
2014-11-20 13:17:35 -08:00
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