Commit Graph

9577 Commits

Author SHA1 Message Date
Tao Bao ad20b76397 Merge "minui: Export minui/minui.h."
am: 13d15af08f

Change-Id: I12755c0fa6b184e68b49899e1cf589161e24eb62
2017-01-17 19:12:28 +00:00
Tao Bao 13d15af08f Merge "minui: Export minui/minui.h." 2017-01-17 19:08:48 +00:00
Tao Bao 0ecbd76b22 minui: Export minui/minui.h.
For libminui static and shared libraries.

Test: build
Change-Id: Ib30dc5e2ef4a3c8b3ca3a0cec68cb65e229a0c16
2017-01-16 21:28:18 -08:00
gitbuildkicker b973ac9a2f merge in oc-release history after reset to master 2017-01-15 00:07:00 -08:00
Tao Bao b04905fae7 Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d am: 81bffbda89
am: 5f877b01b0

Change-Id: I22e6dca540a9099209d2cf6c74910707ca2fd8fe
2017-01-14 15:57:42 +00:00
Tao Bao 5f877b01b0 Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d
am: 81bffbda89

Change-Id: If10fa9ea7cc0254c3b38eb29c5c309ae761d53f4
2017-01-14 15:46:41 +00:00
Tao Bao 81bffbda89 Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71
am: 421d92707d

Change-Id: I4f87ad321fba45f98f7adfd12937bf484025873e
2017-01-14 15:43:10 +00:00
Tao Bao 421d92707d Merge "recovery: Move property_get() to android::base::GetProperty()."
am: ebb4e96a71

Change-Id: I248ed1d7e9099c5e89a758fb8d36fa5e13ab538c
2017-01-14 15:40:10 +00:00
Tao Bao ebb4e96a71 Merge "recovery: Move property_get() to android::base::GetProperty()." 2017-01-14 15:37:01 +00:00
Tianjie Xu 86a820cb42 Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93e
am: f92c313723

Change-Id: I36ab3a5d46758ef45854efd16dcf8285166d1dc4
2017-01-13 23:13:38 +00:00
Tianjie Xu f92c313723 Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8
am: e05674f93e

Change-Id: I8ea1c6c8785b7810971de14a0ea61f727ffef765
2017-01-13 23:11:07 +00:00
Tianjie Xu e05674f93e Merge "Update background text images in recovery" am: f0af02fea6
am: 19e4f627d8

Change-Id: Ic16111cc970780090827f3e2851e4df874a5d8cf
2017-01-13 23:09:07 +00:00
Tianjie Xu 19e4f627d8 Merge "Update background text images in recovery"
am: f0af02fea6

Change-Id: I9d287b5d0f5e7b93f77c8c5ea966e800a06a8178
2017-01-13 23:06:36 +00:00
Tianjie Xu f0af02fea6 Merge "Update background text images in recovery" 2017-01-13 23:02:17 +00:00
Tao Bao efc35594dd recovery: Move property_get() to android::base::GetProperty().
Test: Apply two A/B incremental OTAs with the new recovery image. The
      one with incorrect pre-build should be blocked, while the other
      works fine.

Change-Id: I94d97eb8798599da1630f66343fb603e87464187
2017-01-13 12:08:34 -08:00
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