tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
68142 commits 1 branch 0 tags 119 MiB
Commit graph

7067 commits

Author SHA1 Message Date
Tianjie Xu
f6b0177efc Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0 am: 5e1d91756b am: f6dcbbe401 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38e818e1fc340943ce675bb4247691b121f11cc1
 2020-12-11 21:47:09 +00:00
Yifan Hong
8163f82b70 Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." am: 999779bdce am: 1b38e254df am: c102a147ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/1524321

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I995b9d4a77ad376ca088a214d35c5fdc574c9ed3
 2020-12-11 21:46:49 +00:00
Tianjie Xu
f6dcbbe401 Merge "Use sha256 to build the hashtree in avb image" am: 7d958f4fd0 am: 5e1d91756b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9650ba77ea46df0e8692239f90c5a81e292c196
 2020-12-11 21:26:24 +00:00
Yifan Hong
c102a147ad Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." am: 999779bdce am: 1b38e254df 
Original change: https://android-review.googlesource.com/c/platform/build/+/1524321

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If89a284d99143e10bbc4abff7d2f128c26f80bc3
 2020-12-11 21:26:00 +00:00
Tianjie Xu
7d958f4fd0 Merge "Use sha256 to build the hashtree in avb image" 2020-12-11 20:56:05 +00:00
Yifan Hong
999779bdce Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." 2020-12-11 20:24:19 +00:00
Orion Hodson
28597b5ab3 Merge "Revert "Move keymint to android.hardware.security."" am: 88256fd724 am: 46a5e283fb am: e91c0ac7fd 
Original change: https://android-review.googlesource.com/c/platform/build/+/1525799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07051ffab23c4c2907a7f3b94837b02dad66f6b9
 2020-12-11 14:02:27 +00:00
Orion Hodson
e91c0ac7fd Merge "Revert "Move keymint to android.hardware.security."" am: 88256fd724 am: 46a5e283fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/1525799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45b2ad560dd9548fb3ebcb2b2f152e5598171f6d
 2020-12-11 13:31:37 +00:00
Orion Hodson
88256fd724 Merge "Revert "Move keymint to android.hardware.security."" 2020-12-11 12:29:46 +00:00
Shawn Willden
e6d5fea66a Merge "Move keymint to android.hardware.security." am: 43943c65e2 am: aad1b4e472 am: 2d9112ad68 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieea40511d490321950b1aee4df9c760727091dee
 2020-12-11 11:01:04 +00:00
Orion Hodson
ea21979e96 Revert "Move keymint to android.hardware.security." 
Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I1d1b8e1131328dd27b3a1818298b1c019dac59aa
 2020-12-11 10:45:43 +00:00
Will McVicker
db9cbcb516 Merge "Update aosp_arm64 kernel 4.19 prebuilt name" am: c0d7c7204f am: 1c6d82a879 
Original change: https://android-review.googlesource.com/c/platform/build/+/1524118

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a95886dda7ae75b7870308dbdd0227c522d5ec9
 2020-12-11 08:53:19 +00:00
Will McVicker
c0d7c7204f Merge "Update aosp_arm64 kernel 4.19 prebuilt name" 2020-12-11 07:52:19 +00:00
Tianjie
055128bf10 Use sha256 to build the hashtree in avb image 
The hashtree is used in verified boot, and sha256 is more robust against
malicious attacks. Also, sha256 uses the same space as sha1 in the
hashtree. And there isn't much performance regression per
https://b.corp.google.com/issues/156162446#comment18

By putting the config in BoardConfigMainlineCommon.mk, we enable sha256
on all Pixels. And devices who want to use a different hash algorithm
can override it in it's own board configs.

Bug: 156162446
Test: boot the device and check performance
Change-Id: I9f1d3bcf241bc65adf10376cc5ae7ab1986216fa
 2020-12-11 01:26:12 +00:00
Shawn Willden
2d9112ad68 Merge "Move keymint to android.hardware.security." am: 43943c65e2 am: aad1b4e472 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib875956e49549dff589fa1d5d026e5b4154b4d1b
 2020-12-10 23:49:39 +00:00
Shawn Willden
43943c65e2 Merge "Move keymint to android.hardware.security." 2020-12-10 22:49:14 +00:00
yawanng
a5a0ab7e6a [DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. am: b73d551613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/13194361

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I110f7abf1009ecf428483e80eea6d1f679c979d9
 2020-12-10 22:17:39 +00:00
Yifan Hong
e086ae045e require-artifacts-in-path does not require PRODUCT_NAME/BRAND. 
Also make generic_ramdisk.mk not to define them.

Test: m nothing
Change-Id: I5eff49abebe4194e3eba78557e5765e6ef2231e6
 2020-12-10 13:18:29 -08:00
yawanng
b73d551613 [DO NOT MERGE] iorap: Turn off iorap for R before resolving the regression. 
Setting 'ro.iorapd.enable' flag will be safter to turn off
IORap for R qpr compared with setting mendel flags.

Bug: 174588448
Test: Make
Change-Id: Ia4b3c3f4108e58847082c9a3b2229bab83fe02c5
 2020-12-10 19:32:42 +00:00
Will McVicker
55cd0ee523 Update aosp_arm64 kernel 4.19 prebuilt name 
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
Merged-In: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
 2020-12-10 18:47:03 +00:00
Will McVicker
86f6344fbb Update aosp_arm64 kernel 4.19 prebuilt name 
The aosp_arm64 kernel 4.19 prebuilt name is now kernel-4.19-gz instead
of Image.gz.

Bug: 172246735
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I4e6a1fefdf207f97cc6ec5e6ebec261473d1218d
 2020-12-10 10:45:26 -08:00
Anton Hansson
bb7111322c Merge changes Ib2a4a208,Ic8235912 am: 63d3835f4a am: 5f71a978d0 am: c6bd47a429 
Original change: https://android-review.googlesource.com/c/platform/build/+/1520781

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76f7065fa5c49c4ab33c024edeac9d5b11b92eab
 2020-12-10 13:22:01 +00:00
Anton Hansson
63d3835f4a Merge changes Ib2a4a208,Ic8235912 
* changes:
  Set allow list for generic ramdisk
  Add a "relaxed" mode for require-artifacts-in-path
 2020-12-10 12:20:26 +00:00
Shawn Willden
85573ddd41 Move keymint to android.hardware.security. 
Test: VtsAidlKeyMintTargetTest
Change-Id: I86bccf40e0f5351b573248b59846cea017204c4a
 2020-12-09 20:55:53 -07:00
Lingfeng Yang
93f74429fa Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6 am: e44fd5916c am: 12492e2810 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9cd59f6ed5c7051b85ea670f35a3f15eed78f92
 2020-12-09 20:19:45 +00:00
Lingfeng Yang
e44fd5916c Merge "emulator_arm64: Don't support AArch32" am: d5f89b11e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518218

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad467e4dd38e55d978142fa8582194278d371e3
 2020-12-09 18:34:38 +00:00
Lingfeng Yang
d5f89b11e6 Merge "emulator_arm64: Don't support AArch32" 2020-12-09 17:47:33 +00:00
Yifan Hong
e51c7e8aef Set allow list for generic ramdisk 
Devices that uses generic ramdisk must inherit from generic_ramdisk.mk.
This makefile ensures that only a set of files can be installed to the
ramdisk. Other files must be installed to the vendor-ramdisk.

Let aosp_arm64 use this makefile.

Fixes: 173742069
Test: manual
Change-Id: Ib2a4a208deaf2f4d707bec256207b4b8479a601a
(cherry picked from commit bc9608c4c3f3cd0ac3f29863209c80fcfe4e2f7f)
 2020-12-09 16:31:25 +00:00
Christian Wailes
4af080d7d7 Merge "Added new compiler filter properties for dexopt." am: e42b9ceb81 
Original change: https://android-review.googlesource.com/c/platform/build/+/1479801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4adf3e98b8ee18683339247537433239e33e2046
 2020-12-09 01:22:52 +00:00
Christian Wailes
e42b9ceb81 Merge "Added new compiler filter properties for dexopt." 2020-12-09 00:00:26 +00:00
Yifan Hong
2b7b66d475 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29 am: 6dbe939e08 am: d7fe9121b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a728504e674d02d66c7240ddd9f41abbd1c905c
 2020-12-08 20:34:39 +00:00
Yifan Hong
6dbe939e08 Merge "Remove e2fsck from generic ramdisk." am: 748d568b29 
Original change: https://android-review.googlesource.com/c/platform/build/+/1518222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eb169faa932d05c4ad79ed9e2304b5bb8157375
 2020-12-08 19:18:27 +00:00
Yifan Hong
748d568b29 Merge "Remove e2fsck from generic ramdisk." 2020-12-08 18:43:28 +00:00
Lingfeng Yang
9b6de576dc emulator_arm64: Don't support AArch32 
This is needed for the emulator to run on Apple Silicon.

In addition, we're going to move to 64-bit only soon across the platform
so it makes more sense to go with 64-bit-only going forward here.

Change-Id: I0d9d189cd0b7a07d6c315e8c0f99c7b4766b4bde
 2020-12-08 00:26:06 +00:00
Chris Wailes
edbbf82586 Added new compiler filter properties for dexopt. 
Bug: 173137187
Test: build
Merged-In: Ie413f5f0bcf5f691135530caee9111a496788ef8
Change-Id: Ie413f5f0bcf5f691135530caee9111a496788ef8
 2020-12-07 16:15:55 -08:00
Christian Wailes
5ccc11d23c Merge "Added new compiler filter properties for dexopt." 2020-12-07 20:08:06 +00:00
Yifan Hong
1482fba34f Remove e2fsck from generic ramdisk. 
On devices using the generic ramdisk / GKI,
e2fsck is moved to vendor ramdisk now.

Fixes: 173425293
Test: build and manual inspect.
Change-Id: I27562a875ca33a1b6dd3dcf862232fd4dfef6564
 2020-12-04 15:28:57 -08:00
Yifan Hong
1ab5b9e4a1 Merge "Add linker to VAB with vendor_ramdisk" am: 69ba9af617 am: a3237f249c am: 6cf5fb4010 
Original change: https://android-review.googlesource.com/c/platform/build/+/1515823

Change-Id: I4bab84ec54cbba165308b151389d67e4d9ed8018
 2020-12-04 01:35:43 +00:00
Chris Wailes
6cac3c2d0c Added new compiler filter properties for dexopt. 
Bug: 173137187
Test: build
Change-Id: Ie413f5f0bcf5f691135530caee9111a496788ef8
 2020-12-03 15:12:31 -08:00
Yifan Hong
a3237f249c Merge "Add linker to VAB with vendor_ramdisk" am: 69ba9af617 
Original change: https://android-review.googlesource.com/c/platform/build/+/1515823

Change-Id: I080a319718999524d1d6420570c0408b4613c785
 2020-12-03 20:14:59 +00:00
Yifan Hong
0f87e32b42 Merge "Add Virtual A/B with vendor ramdisk product." am: 08d1865332 am: 90dd8696d4 am: 2d3d56f1aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506505

Change-Id: I427f79cf5d369edba314b9f69bf244ee8bb6b1e0
 2020-12-03 05:20:45 +00:00
Yifan Hong
914ef21c28 Add linker to VAB with vendor_ramdisk 
Add linker.vendor_ramdisk for Virtual A/B devices with
a vendor_ramdisk because e2fsck is dynamic.

Test: pass
Bug: 173425293
Change-Id: I0a6f5bf15362e28eaa07a4d639ea23749b94b0f5
 2020-12-02 19:51:16 -08:00
Yifan Hong
90dd8696d4 Merge "Add Virtual A/B with vendor ramdisk product." am: 08d1865332 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506505

Change-Id: If927d3717936c4eaa382ceb691f780a9f7e3f2c1
 2020-12-03 03:46:54 +00:00
Yifan Hong
08d1865332 Merge "Add Virtual A/B with vendor ramdisk product." 2020-12-03 03:02:35 +00:00
Xin Li
4bc4ff3c11 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 
Bug: 172690556
Merged-In: I880b5dfb7bfea4b6abef9fcb603abcb383d84f42
Change-Id: I3c3385a1c58004f1ee6124de0c86dfff614a3bf6
 2020-12-02 00:03:31 -08:00
Anton Hansson
ad38c3f252 Merge "Add bootclasspath config to its own makefile" 2020-11-26 10:56:01 +00:00
Anton Hansson
5add55ede1 Add bootclasspath config to its own makefile 
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
 2020-11-25 19:32:02 +00:00
Anton Hansson
8c73673e73 Add bootclasspath config to its own makefile 
This is part of adding some devices/products suitable for unbundled
builds. An unbundled product does not need all the PRODUCT_PACKAGES
etc present in the normal hierarchy of products, but does need to know
which jars are on the bootclasspath.

Therefore, factor out the bootclasspath config from base_system.mk and
put it in its own makefile where it can be inherited by these unbundled
products.

Bug: 172256440
Test: diff presubmit artifacts (noop)
Merged-In: Id3f91e387bba2e0525b4010f22fe380d1d8be537
Change-Id: Id3f91e387bba2e0525b4010f22fe380d1d8be537
 2020-11-25 18:53:37 +00:00
Neil Fuller
8cb8a5f900 Merge "Add the geotz jar to the system server" 2020-11-24 15:38:59 +00:00
Treehugger Robot
e91a9246ab Merge changes from topic "vab_makefile_move" am: 3e2f8dae78 am: e4b1c1c64e am: 107d74afb3 
Original change: https://android-review.googlesource.com/c/platform/build/+/1506504

Change-Id: I869d330ab5c3cd76d2fb4387300309d1e7dec31b
 2020-11-24 03:37:12 +00:00