Roozbeh Pournader
9b85a44355
Merge "Rename language+country resources to just language"
2017-01-13 20:08:16 +00:00
Alex Deymo
9d33dac7f1
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 am: a1e336d548
...
am: a6adbefa2c
Change-Id: Ife8bfd65d7d439fab60cd462fa272912a6fd99bf
2017-01-12 22:48:17 +00:00
Alex Deymo
866e72bf99
Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4c
...
am: 3cbb199e24
Change-Id: Ia2447e399bd979402b535e8d7228ab0dad106d78
2017-01-12 22:45:28 +00:00
Alex Deymo
f906d2ba70
Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94
...
am: 68b7f08b96
Change-Id: Ia98ed0b8e0d50c2256dcacb1a5240e98c68f4adb
2017-01-12 22:45:25 +00:00
Alex Deymo
a6adbefa2c
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850
...
am: a1e336d548
Change-Id: Ic444b595aba05ccbd4eee3f92c4739fbd7c277fa
2017-01-12 21:40:10 +00:00
Alex Deymo
3cbb199e24
Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a
...
am: 9e93a79f4c
Change-Id: Ic1f49f4d225086fa7d7a810a6ba4c736ff319e3e
2017-01-12 21:37:38 +00:00
Alex Deymo
68b7f08b96
Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899
...
am: 9edd655f94
Change-Id: I6191d76d293d4b14e34eaafa227429999707e460
2017-01-12 21:37:36 +00:00
Alex Deymo
a1e336d548
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb
...
am: f8f1a25850
Change-Id: I8b112d02b4a718ff258585e84fa4dfb3ba62dddc
2017-01-12 21:35:11 +00:00
Alex Deymo
9e93a79f4c
Remove "_static" suffix from libsparse am: 67f3aa8804
...
am: 204369ef1a
Change-Id: I614ac38fae44e6cee4a9c2abc35574e6041dc303
2017-01-12 21:32:38 +00:00
Alex Deymo
9edd655f94
Remove "_static" suffix from libext4_utils. am: 31653660ad
...
am: 4b54093899
Change-Id: Iec132548bf78f7c076217bda4e7f24b7acf35f33
2017-01-12 21:32:36 +00:00
Alex Deymo
f8f1a25850
Merge changes from topic 'host_suffix_cleanup'
...
am: 8031c2d2bb
Change-Id: Ifcbf0829692fcac31c5246a07994be1ce0f6ba59
2017-01-12 21:32:34 +00:00
Alex Deymo
204369ef1a
Remove "_static" suffix from libsparse
...
am: 67f3aa8804
Change-Id: Id40f2a7335fed5b0669a98eaa0815b129e35432d
2017-01-12 21:27:38 +00:00
Alex Deymo
4b54093899
Remove "_static" suffix from libext4_utils.
...
am: 31653660ad
Change-Id: Iae744743d29b3669dd57403a2eb90153e5efbe46
2017-01-12 21:27:37 +00:00
Alex Deymo
8031c2d2bb
Merge changes from topic 'host_suffix_cleanup'
...
* changes:
Remove "_static" suffix from libsparse
Remove "_static" suffix from libext4_utils.
2017-01-12 21:23:10 +00:00
Hashcode
5733215112
build: AOSP/CM14 fixes (API 24/25, mainly BusyBox-less environment)
...
These changes are needed by any ROM where devices are configured to
use TOOLBOX/TOYBOX instead of BUSYBOX (i.e., TW_USE_TOOLBOX := true).
Change-Id: I68b88cc9fb857f32864556c4b6c9c8e6ee744051
2017-01-12 12:50:18 -05:00
sndnvaps
7dde36df11
updater: link libcrypto_utils_static if it exist
...
Change-Id: I9bf238a3e29d88850a6cc69f07954949722c35d7
Signed-off-by: sndnvaps <sndnvaps@gmail.com >
2017-01-12 11:39:42 -06:00
D. Andrei Măceș
1c28904749
libtar: Use relative path for crypto/ext4crypt include
...
Don't assume path to be bootable/recovery (i.e., support CM's
RECOVERY_VARIANT).
Change-Id: Ib53cc919c5a9beb3beee71d7227a7c957a24b601
2017-01-12 18:35:29 +01:00
Bill Yi
44034377cb
Import translations. DO NOT MERGE
...
Change-Id: Ie80a9f0a82341c96343024296b555621ed4de347
Auto-generated-cl: translation import
2017-01-12 05:03:56 -08:00
Alex Deymo
67f3aa8804
Remove "_static" suffix from libsparse
...
Bug: 34220783
Change-Id: I358f931f0b29f5bd526e1475180e477e2e90b936
2017-01-11 14:38:30 -08:00
Alex Deymo
31653660ad
Remove "_static" suffix from libext4_utils.
...
Bug: 34220783
Change-Id: I34ccc3b11da0d1b48805967ad75b9ddade569930
2017-01-11 14:02:13 -08:00
nailyk-fr
1021edf17e
bootloader_message: Allow TWRP to ignore wipe-data command into misc
...
* Rebase of https://gerrit.omnirom.org/#/c/20750/ patch-set 3
* Original commit message:
fix: recently a change in AOSP causes a bootloop to TWRP
(and therefore all ROM's based on it)
Reason: AOSP enables use of /misc partition and normally the fstab in
TWRP will not have /misc added. The problem is now when Android writes
a wipe command to /misc it will force TWRP to boot but TWRP will do
nothing - leaving the cmd in /misc. This results in a bootloop to TWRP.
Solution: I added a new var TW_IGNORE_MISC_WIPE_DATA which can be
set to "true" in Boardconfig.mk of a device requiring this which then
ignores /misc commands like it would be when /misc would be just not in
fstab BUT with this change TWRP clears the bit in /misc so a normal boot
can happen.
Besides that if the device do not have an own recovery key combo and
/misc is enabled we want to open TWRP after walking through the factory
reset screen - without actually doing a factory reset.
kudos to nailyk (and DevUt) for the help with the C++ code!
Change-Id: If6fed5872015f1a66304e3edbdb787c507236f69
2017-01-11 18:09:59 +01:00
James Christopher Adduono
dcd1e440e0
Support theme width and height offsets
...
Current use condition is LG V20, where the secondary screen is
actually just a corner chunk of the main screen.
In this case, we need to shift the UI down some pixels in order
to see it all, but just using Y offsets resulted in losing
the rest of the GUI below.
Example in BoardConfig.mk:
# Shift TWRP off the secondary screen
TW_Y_OFFSET := 160
TW_H_OFFSET := -160
Change-Id: I5a06638ba0d05e5b9fd8a6245c630d6ea3394f78
2017-01-11 18:04:29 +01:00
D. Andrei Măceș
b29a5e27c3
build: Consolidate the crypto_utils presence tests
...
No point checking filesystem repeatedly/check may change in future
Change-Id: I0413b07b850f785eb5150c6ed18836cc56e94d6f
2017-01-11 10:56:21 -06:00
Ethan Yonker
4767caf1f4
Fix compile error on 4.4 tree
...
Change-Id: Id85fdf0f4dee02f8ee3ae50ec42423c6a154a3eb
2017-01-11 10:45:04 -06:00
gitbuildkicker
b4d722ffc1
merge in oc-release history after reset to master
2017-01-11 00:07:02 -08:00
Roozbeh Pournader
f23f328513
Rename language+country resources to just language
...
Bug: 26496609
Test: none
Change-Id: I6467c8496478402614fcdb46c5399dfa28162201
2017-01-10 16:22:48 -08:00
Tianjie Xu
5c65825891
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 am: 7d345f27e7
...
am: 4ab40a064d
Change-Id: Ibfca4384125a264124a2485f0a69d6e0ea4cafab
2017-01-10 19:23:53 +00:00
Tianjie Xu
4ab40a064d
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1
...
am: 7d345f27e7
Change-Id: I9ae05b6590af22e98c7cd31a480b4e4c73b67226
2017-01-10 19:17:55 +00:00
Tianjie Xu
7d345f27e7
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20
...
am: 854ef3b9d1
Change-Id: Ic3939632a16b54c2b77732c48c1ace8105298e2f
2017-01-10 19:12:24 +00:00
Tianjie Xu
854ef3b9d1
Merge "Do not inject I/O fault on a retry"
...
am: 37d74f3e20
Change-Id: Ie34000f89b027b79f4161edc7b53b3dd14e51d6a
2017-01-10 19:07:23 +00:00
Tianjie Xu
37d74f3e20
Merge "Do not inject I/O fault on a retry"
2017-01-10 19:00:15 +00:00
gitbuildkicker
02f7305b7e
merge in oc-release history after reset to master
2017-01-10 00:06:26 -08:00
Elliott Hughes
1fe1d8eb05
Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3
...
am: d481352f05
Change-Id: I71a3e6c3c365f1941c94569c4d022e402379459f
2017-01-10 01:18:22 +00:00
Elliott Hughes
d481352f05
Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda
...
am: ac431948d3
Change-Id: Ide8ad96300b13f8cc32717c61fdddfebbf2dd04e
2017-01-10 01:13:21 +00:00
Elliott Hughes
ac431948d3
Merge "Address review comment." am: 77ec0071cf
...
am: 3e003ceeda
Change-Id: I3f984543d2724c26f8720a4eaeea177b94cf0068
2017-01-10 01:08:22 +00:00
Elliott Hughes
3e003ceeda
Merge "Address review comment."
...
am: 77ec0071cf
Change-Id: I0b40813d4c40e104ee111c45e13d6f278e6d705c
2017-01-10 01:03:21 +00:00
Elliott Hughes
77ec0071cf
Merge "Address review comment."
2017-01-10 00:55:53 +00:00
Tianjie Xu
4728242070
Do not inject I/O fault on a retry
...
We could inject I/O faults during an OTA update for test purpose. But we
should skip the injection if the update is an retry. Otherwise the
update test will simply keeps failing.
Bug: 34159970
Test: Apply the same package on angler and the update succeeds on the 2nd try.
Change-Id: Id274e5475e3bc8d25d50a8cf61a77d2e32c569d6
2017-01-09 14:51:15 -08:00
Elliott Hughes
9c76d255dd
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 am: 6ac5db29db
...
am: f6d4b1ec09
Change-Id: Ida79628ed3fc418324f32197c77b2d1db787c0fb
2017-01-09 22:47:29 +00:00
Elliott Hughes
f6d4b1ec09
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8
...
am: 6ac5db29db
Change-Id: Iad647704a2fc7d7fcfe7ca4c07eec7c1df7e0e02
2017-01-09 22:43:30 +00:00
Elliott Hughes
6ac5db29db
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32
...
am: 61728ff4d8
Change-Id: I24746abcc64ed7fe89cf82fa844c719912a77d21
2017-01-09 22:38:29 +00:00
Elliott Hughes
61728ff4d8
Merge "Move to .md files for even trivial documentation."
...
am: 2fc1ff3b32
Change-Id: Idb55c0fcfa99fef4a584d48e39b63e45bd598bf3
2017-01-09 22:33:31 +00:00
Elliott Hughes
ff8fdc955a
Address review comment.
...
Bug: N/A
Test: N/A
Change-Id: I9467286e57522c6ed640a3599cb678ac10d9e2a4
2017-01-09 14:28:42 -08:00
Elliott Hughes
2fc1ff3b32
Merge "Move to .md files for even trivial documentation."
2017-01-09 22:25:53 +00:00
Tao Bao
e204b1469f
Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c am: b7ce9c5e00
...
am: 931bc0c3d1
Change-Id: I9fc2dca136b91a8b30bea1bbdd8c5e577750f0e8
2017-01-09 21:50:39 +00:00
Tao Bao
931bc0c3d1
Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c
...
am: b7ce9c5e00
Change-Id: Ia85d957754774a4aa9825754339e8745e4d55663
2017-01-09 21:45:39 +00:00
Tao Bao
b7ce9c5e00
Merge "recovery: Fix the argument parsing." am: 33808f16c5
...
am: fe0a80184c
Change-Id: Id077e40e0fa27fb94fee942e95430eb02c369333
2017-01-09 21:40:39 +00:00
Tao Bao
fe0a80184c
Merge "recovery: Fix the argument parsing."
...
am: 33808f16c5
Change-Id: I9ae6633598262f21cca63f90cd51f6b84e5fead2
2017-01-09 21:35:39 +00:00
Tao Bao
33808f16c5
Merge "recovery: Fix the argument parsing."
2017-01-09 21:28:19 +00:00
Tao Bao
570af9dca3
recovery: Fix the argument parsing.
...
Commit f0ed159f48 unintentionally changed
the behavior when parsing the arguments from BCB and command file. It
should only parse the command file for arguments if BCB doesn't supply
any.
As a result, it shows the following from the log:
I:Got 2 arguments from boot message
I:Got 3 arguments from /cache/recovery/command
Test: Set arguments in BCB and command file both. It should only use the
arguments from BCB.
Change-Id: Idf371137aa9177f1b2dfdfecf0c9f46959d2ee76
2017-01-09 10:35:42 -08:00