Commit Graph
10911 Commits
Author SHA1 Message Date
bigbiff 973167aff3 ramdisk: move uevent link that build creates
Add missing init.rc files for recovery.
Cleanup init symbolic links.
Comment out removing the source file in relink.sh because we need
to retain files in /system in the ramdisk.
Change-Id: Ie959024296738538f3b3161e38027a44525b0696

Change-Id: I5b1a744414b88a9a15c56bd81f37091664d5cdf1
2020-04-09 16:47:23 -04:00
bigbiff 4721a5a1a3 unzip: relink unzip binary from system/bin
Change-Id: I69a8c86c3c817f0a539be53a52f33b8bb6813fdf
2020-04-05 10:32:40 -04:00
bigbiff 36f088ac7c adbd: relink sh properly
Change-Id: Ifb4eba0cded949db66a9d3b77bb185828425d197
2020-04-04 19:58:19 -04:00
Josh GaoandAutomerger Merge Worker 9267225df0 minadbd: statically link libadbd. am: 22beef1b28
Change-Id: Icc9c9b8b49af6253a012fc948f6c9b07ae5a28ab
2020-04-01 04:34:50 +00:00
Josh Gao 22beef1b28 minadbd: statically link libadbd.
Reduce the amount of wasted space on the recovery image by statically
linking all of the adb libraries into minadbd.

Bug: http://b/150317254
Test: booted aosp_walleye-eng into recovery
Change-Id: I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a
Merged-In: I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a
(cherry picked from commit 5ee3eba34f0ddf478f53ac4d0774c1ee423a5182)
2020-03-31 17:02:45 -07:00
bigbiff 63d7add7cf logd: make logd run and relink logcat
Change-Id: I5a2984ea2649bebd923d42e6b984856b36b18fbd
2020-03-31 18:00:59 -04:00
Andreas Schneiderandbigbiff a4e510ee54 init: ueventd already needs /acct
Change-Id: Ifae7078aedc1a520ee003160fb17c8893041cb09
(cherry picked from commit ec350e9d0d)
2020-03-30 17:06:17 -04:00
Andreas Schneiderandbigbiff ec350e9d0d init: ueventd already needs /acct
Change-Id: Ifae7078aedc1a520ee003160fb17c8893041cb09
2020-03-30 21:02:48 +00:00
mauronofrio cb163e0b14 Relink update_engine_sideload
Change-Id: Ifb95d94a5804f0d490bc8c2c19cab7b03c8f1432
2020-03-30 16:46:35 +02:00
bigbiff 416fe3a18a toybox: deprecate busybox and toolbox utils
Starting with android-10.0 we should only use tools from toybox.
Toyxbox in android-10.0 is specified as a recovery target, so
we just move the symlinks in our relink target.

Change-Id: Ic0116a7d583519b39422ac4d82d30e00918eb29d
2020-03-28 14:13:43 -04:00
Tianjie XuandAutomerger Merge Worker 52a4036a4b Merge "Add libavb as a dependency" into rvc-dev am: 94ca355137
Change-Id: Iee6771655bb6bc13fc94df517a76353552c524be
2020-03-27 20:56:09 +00:00
Tianjie XuandAndroid (Google) Code Review 94ca355137 Merge "Add libavb as a dependency" into rvc-dev 2020-03-27 20:33:48 +00:00
Bill YiandAutomerger Merge Worker 2f0bcbd3dc [automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours
am skip reason: subject contains skip directive

Change-Id: I3b3dbfb8fb2d0bcf79b01fcd86256a334f692a39
2020-03-25 21:25:34 +00:00
Bill Yi c054f231ae Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ia3393b1e62f0af1661cbc7b2c0b19e0a52631c4c
2020-03-25 10:29:41 -07:00
bigbiff bigbiff ac6cc08941 truetype: convert to STL map for handling fonts
In Android 10, libcutils is deprecating the hash functions. This
patchset moves to use the STL map to handle storing related
truetype objects.

This patchset moves the truetype functions to it's own static
class and moves the declarations to a header file. I also removed
statistics functions that were not called from anywhere.

Change-Id: I1679df4c7e844c01e3a2cbdaf5117bb09df2a5f3
2020-03-24 12:01:16 -04:00
bigbiff 6087339d3a prebuilts: don't try to relink again if source is unavailable 2020-03-23 15:41:27 -04:00
theimpulsonandbigbiff d95dcd207c bootable: Move to optional tags everywhere
FAILED:
bootable/recovery/etc/Android.mk: error: init.recovery.ldconfig.rc: LOCAL_MODULE_TAGS := eng is obsolete. See https://android.googlesource.com/platform/build/+/master/Changes.md#LOCAL_MODULE_TAGS
build/make/core/base_rules.mk:171: error: done.
18:29:38 ckati failed with: exit status 1

Change-Id: I056f019aa3249c185b808140bcef45a4777d21b3
Signed-off-by: theimpulson <aayushgupta219@gmail.com>
2020-03-23 15:09:31 -04:00
bigbiff bf3b1564f9 aosp10: minor cleanup, other commented makefiles need to be worked on 2020-03-23 13:58:30 -04:00
bigbiff d58ba18272 AOSP10 TWRP Merge: fix conflicts and update libraries needed
This allows flame to boot TWRP. Still will need to work on
super partition for vendor and system access.

The plan will be to cherry-pick any updates to android-9.0
through gerrit.twrp.me to this branch as a WIP.
2020-03-23 11:18:29 -04:00
bigbiff 26d5d5f0b9 Merge tag 'android-10.0.0_r25' into aosp10-4
Android 10.0.0 release 25
2020-03-23 09:56:16 -04:00
Tianjie XuandAutomerger Merge Worker 32d28f90f0 Consolidate the wait in recovery's reboot am: e8ca1b8634
Change-Id: I27c1594c56f7452e2d1c42a1cb88a9caa85e8798
2020-03-18 23:49:15 +00:00
Tianjie Xu 5bb443aa0a Add libavb as a dependency
It's needed by libfec

Bug: 144388532
Test: mma
Change-Id: Ic82671f6506e7718afa965a511261b1b329ea38f
(cherry picked from commit 2bb374a86d0161700f01b68433063b0b13adc86a)
2020-03-18 21:40:13 +00:00
Tianjie Xu e8ca1b8634 Consolidate the wait in recovery's reboot
After a reboot function call, we should always wait for it to finish
without executing other instructions.

Bug: 151110322
Test: build
Change-Id: I1dda291a0835ff96df7eaf42eba1a38267a3beeb
(cherry picked from commit 00c4aba9bf428717fc00e26a03e97401eca76ee8)
2020-03-18 13:46:49 -07:00
TreeHugger RobotandAutomerger Merge Worker 700dc434dc Merge "Add more mounting options to updater mount function." into rvc-dev am: 342e53d045
Change-Id: I95e8b9fe1e0a90c1ad6370be54c3d99cc10c1bc9
2020-03-18 19:02:20 +00:00
TreeHugger RobotandAndroid (Google) Code Review 342e53d045 Merge "Add more mounting options to updater mount function." into rvc-dev 2020-03-18 18:51:04 +00:00
Hongguang Chen b37d794351 Add more mounting options to updater mount function.
If enabling the oem partition, it will be mounted by updater before
reading product properties from it. To be safety, we want to enable AVB
to this oem partition. But this means the oem partition can never be
mounted to writable. Otherwise, that partition will be corrupted to AVB
verifying.
This change follows fs_mgr to allow to pass more mounting options to the
updater.

BUG: 150156957
Test: make ota package which mounts AVB oem partition to read only and
run OTA.

Change-Id: I2ebbe3c8ac53c70112f3fed2703fcba9170405a6
2020-03-17 16:16:43 -07:00
Automerger Merge Worker 816a82f771 [automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours am: 22f595b2c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I05d2e42124ecd3d5d4bc7615028b9fbc0d869a65
2020-03-17 15:34:48 +00:00
Automerger Merge Worker 22f595b2c5 [automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours
am skip reason: subject contains skip directive

Change-Id: Ibac7db9ffa4af2adee660bbf3fe61b5f21495f13
2020-03-17 15:17:12 +00:00
Bill Yi 2f6ed0524e Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I05a2df29e459400e5af878922f6e73a8b94f042b
2020-03-16 19:53:58 -07:00
Fatih Fırıncıandbigbiff 901141c2eb language: turkish update
Change-Id: I9dab6ea9378f87879384e43dafb2e3ae4f733f68
2020-03-14 17:21:30 -04:00
Martin Dünkelmannandbigbiff c630b3864f Fix 'system/etc/ld.config.txt' not found error
According to

https://android.googlesource.com/platform/system/core/+/refs/tags/android-9.0.0_r51/rootdir/Android.mk#260

the ld.config.txt gets generated with the vndk version as a suffix.
This behaviour exists since API level 28 (Android 9.0), if
BOARD_VNDK_VERSION is defined and BOARD_VNDK_RUNTIME_DISABLE is not
true.

The issue seems to be exist since commit
8d70eb617e in twrp.

Change-Id: I19741c29cda65ce051b7c167a946d551ce149f7b
2020-03-14 21:14:54 +00:00
Mohd Farazandbigbiff 191a6948d9 crypto: fde: decrypt master key first
* Some devices like lavender, etc. getting failed to decrypt

Change-Id: I63ca05c4f87cdd17d48d4541a5a8121c736beb02
Signed-off-by: Mohd Faraz <androiabledroid@gmail.com>
2020-03-09 23:19:54 +00:00
Andreas Schneider 915bbd225e Fix building libuuid
libuuid uses flock() which requires <sys/file.h>.

Change-Id: I230a5d08ce90088d14db2f89a0843bf43029b3c7
2020-03-08 11:44:54 +01:00
dianlujitaoandbigbiff 8a411c8d25 Fix ORS backup and restore for system-as-root
Change-Id: Ice7f2e22ded280f723c19e920a15f3e918c17264
2020-03-08 02:16:10 +00:00
Captain Throwbackandbigbiff a5283b3570 crypto: add more missing newlines
Change-Id: I158b2a8fee89c2543a0b809af8e278702466b106
2020-03-08 02:13:03 +00:00
Captain Throwbackandbigbiff f8d0e2156e openrecoveryscript: do not skip decryption even if using block.map
- Allows addon.d scripts to run that require access
  to decrypted /data (e.g. Magisk). Seems to also affect
  GApps addon.d script, resulting in non-booting system
- If decryption prompt is canceled, installation will
  still proceed (i.e. on devices where TWRP doesn't
  support encryption)
- Should resolve
  https://github.com/TeamWin/Team-Win-Recovery-Project/issues/1478
  and possibly
  https://github.com/TeamWin/Team-Win-Recovery-Project/issues/1459

Change-Id: Idcd397aa145577c409d5174ae3f9c48474e5734b
2020-03-08 00:31:54 +00:00
Captain Throwback d54e1da83e partitionmanager: add /etc to Local_Path
- Prevents errors when using copy_file for
  paths starting with /etc

Change-Id: I7d52acdbc8e67a21e3d32f4793257dbdad5d82de
2020-03-04 16:55:48 -05:00
Automerger Merge Worker c8f84dd3ec Merge "Move libboot_control to boot_control 1.1" into rvc-dev am: 2774d5f4f0
Change-Id: Ic6074c080fb85961947fde29e2fe8a2b3a59836d
2020-03-03 07:08:34 +00:00
TreeHugger RobotandAndroid (Google) Code Review 2774d5f4f0 Merge "Move libboot_control to boot_control 1.1" into rvc-dev 2020-03-03 06:52:35 +00:00
Automerger Merge Worker 68aa73705e New priority scripts + critical updates to fonts. am: cbb0b54b12
Change-Id: I92517d9786a88e1a51d1316b0d05ce1f394e412e
2020-03-03 05:20:50 +00:00
Marek Z Jeziorek cbb0b54b12 New priority scripts + critical updates to fonts.
Author: Marek Z. Jeziorek <marekj@google.com>

Needs to be submitted with
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/10280447

BUGANIZER BUGS Addressed
========================
BUG: 149257053

CHANGES
=======
Remove font files no longer required
deleted:    other/NotoSansAdlam-Regular.ttf
deleted:    other/NotoSansGeorgian-Bold.otf
deleted:    other/NotoSansGeorgian-Medium.otf
deleted:    other/NotoSansGeorgian-Regular.otf
deleted:    other/NotoSansJavanese-Regular.ttf
deleted:    other/NotoSansTifinagh-Regular.ttf
deleted:    other/NotoSerifGeorgian-Bold.otf
deleted:    other/NotoSerifGeorgian-Regular.otf

modified:   fonts.mk
modified:   other/Android.bp

Replacements for the above deleted files:
new file:   other/NotoSansAdlam-VF.ttf
new file:   other/NotoSansGeorgian-VF.ttf
new file:   other/NotoSansJavanese-Regular.otf
new file:   other/NotoSansTifinagh-Regular.otf
new file:   other/NotoSerifGeorgian-VF.ttf

New additions to Android fonts (living/revival languages):
new file:   other/NotoSansGunjalaGondi-Regular.otf
new file:   other/NotoSansHanifiRohingya-Regular.otf
new file:   other/NotoSansKhojki-Regular.otf
new file:   other/NotoSansMasaramGondi-Regular.otf
new file:   other/NotoSansWancho-Regular.otf
new file:   other/NotoSansWarangCiti-Regular.otf

Test: ===================================================
Test: on Android (click on a link within a browser):
Test: Adlam https://en.wikipedia.org/wiki/Adlam_(Unicode_block)
Test: Georgian https://en.wikipedia.org/wiki/Georgian_(Unicode_block)
Test: Georgian https://en.wikipedia.org/wiki/Georgian_Extended
Test: Gunjala Gondi
https://en.wikipedia.org/wiki/Gunjala_Gondi_(Unicode_block)
Test: Hanifi Rohingya
https://en.wikipedia.org/wiki/Hanifi_Rohingya_(Unicode_block)
Test: Javanese https://en.wikipedia.org/wiki/Javanese_(Unicode_block)
Test: Khojki https://en.wikipedia.org/wiki/Khojki_(Unicode_block)
Test: Masaram Gondi
https://en.wikipedia.org/wiki/Masaram_Gondi_(Unicode_block)
Test: Tifinagh https://en.wikipedia.org/wiki/Tifinagh_(Unicode_block)
Test: Wancho https://en.wikipedia.org/wiki/Wancho_(Unicode_block)
Test: Warang Citi
https://en.wikipedia.org/wiki/Warang_Citi_(Unicode_block)
Test: ===================================================
Test: on Android (click on a link within a browser):
Test: udhr Adlam https://unicode.org/udhr/d/udhr_fuf_adlm.html
Test: udhr Georgian https://unicode.org/udhr/d/udhr_kat.html
Test: udhr Gunjala Gondi NA (Not Available)
Test: udhr Hanifi Rohingya NA (Not Available)
Test: udhr Javanese https://unicode.org/udhr/d/udhr_jav_java.html
Test: udhr Khojki NA (Not Available)
Test: udhr Masaram Gondi NA (Not Available)
Test: udhr Tifinagh https://unicode.org/udhr/d/udhr_tzm_tfng.html
Test: udhr Wancho NA (Not Available)
Test: udhr Warang Citi NA (Not Available)
Test: ===================================
Test: on Android (comparing two systems - before/after)
Test: Georgian: Systems settings menus compared side by side
Test: ===================================
Test: on Mac (comparing the existing Android fonts with the new font
Test: using diffenator - https://github.com/googlefonts/fontdiffenator)
Test: ===================================
Test: SansAdlam-VF: VALIDATED
Test: SansGeorgian-VF: VALIDATED
Test: SansGunjalaGondi: NEW (No Applicable)
Test: SansHanifiRohingya: NEW (No Applicable)
Test: SansJavanese: VALIDATED
Test: SansKhojki: NEW (No Applicable)
Test: SansMasaramGondi: NEW (No Applicable)
Test: SansTifinagh: VALIDATED
Test: SansWancho: NEW (No Applicable)
Test: SansWarangCiti: NEW (No Applicable)
Test: SerifGeorgian-VF: VALIDATED

Change-Id: I41e030b63f83ec243ae6f174c061faa5298bd6dc
Signed-off-by: Marek Z Jeziorek <marekj@google.com>
(cherry picked from commit f165b9c886476889d99edad8d3e43b2980b855a1)
2020-02-28 14:33:58 +00:00
Tianjie Xu 9c8d0f6103 Move libboot_control to boot_control 1.1
It should belong to the default /misc implementation of boot control
1.1. Right now, it's only used by cuttlefish. So move it over to reduce
confusion in bootloader_message.

Bug: 131775112
Test: build
Change-Id: If09bc6f4cc8adf74c8798048c8e54ec94566abaa
(cherry picked from commit dc4d2a70db40a302cb7001ddbc41816e7187d5c5)
2020-02-26 12:14:54 -08:00
Automerger Merge Worker 67ab5e4bee [automerger skipped] Force package installation with FUSE unless the package stores on device am: ba27adbbb6 -s ours am: e00afc3fbf -s ours
am skip reason: Change-Id Ibc9b095036a2fa624e8edf6c347ed4f12aef072f with SHA-1 5e6c4e9a91 is in history

Change-Id: Idb8d1b20ddecef33a912ca41ae497a6bbe515db9
2020-02-21 19:44:31 +00:00
Automerger Merge Worker e00afc3fbf [automerger skipped] Force package installation with FUSE unless the package stores on device am: ba27adbbb6 -s ours
am skip reason: Change-Id Ibc9b095036a2fa624e8edf6c347ed4f12aef072f with SHA-1 5e6c4e9a91 is in history

Change-Id: I27862517a8dd9f64325226bcb73643f82da30398
2020-02-21 19:25:03 +00:00
Automerger Merge Worker c6f36bfd30 Merge "recovery: add a way to enable metadata_csum for ext4" am: 5ac6163822 am: 9af39bf5c4 am: 4d1f8869f4
Change-Id: I1e277b5ba5e45bcf1388c4658fa4fb713092999e
2020-02-21 06:05:03 +00:00
Automerger Merge Worker 4d1f8869f4 Merge "recovery: add a way to enable metadata_csum for ext4" am: 5ac6163822 am: 9af39bf5c4
Change-Id: I7f7552d6b24eff0d91d68ed5d1bf6f59bb723815
2020-02-21 05:54:41 +00:00
Automerger Merge Worker 9af39bf5c4 Merge "recovery: add a way to enable metadata_csum for ext4" am: 5ac6163822
Change-Id: I9957761c02094993bc84192e86069bd0832baee7
2020-02-21 05:41:19 +00:00
Jaegeuk KimandGerrit Code Review 5ac6163822 Merge "recovery: add a way to enable metadata_csum for ext4" 2020-02-21 05:40:48 +00:00
Automerger Merge Worker 21a343c279 Merge "updater_sample: add internet access permission" am: c760702633 am: a599c6ca45 am: 70cf3d4556
Change-Id: I7888de77f684405bf67872ae77bd2338d004d110
2020-02-20 23:39:25 +00:00
Automerger Merge Worker 70cf3d4556 Merge "updater_sample: add internet access permission" am: c760702633 am: a599c6ca45
Change-Id: I50d2fd15539073b838fdb7ac04a85c4db8fbffff
2020-02-20 23:28:32 +00:00