Commit Graph

60655 Commits

Author SHA1 Message Date
Treehugger Robot
c7d65744c4 Merge "support different boot partition sizes in aosp_arm64" am: def74b4c2b am: 3bfb87b96b
Change-Id: Iff0c4a70c7a3ed43d2f96a72a0dd16c4301386f0
2020-05-19 22:02:28 +00:00
Treehugger Robot
3bfb87b96b Merge "support different boot partition sizes in aosp_arm64" am: def74b4c2b
Change-Id: Ifb89214358958ab0c2f407b98cef676c78ad2f21
2020-05-19 21:41:08 +00:00
Treehugger Robot
def74b4c2b Merge "support different boot partition sizes in aosp_arm64" 2020-05-19 21:30:07 +00:00
Treehugger Robot
3264459841 Merge "Delete deps-license target." am: c2c427f6bb am: 724ea1f3b4
Change-Id: Ib774278b4818b0b9d0c9856b675cbb24c552b8aa
2020-05-19 18:25:10 +00:00
Treehugger Robot
724ea1f3b4 Merge "Delete deps-license target." am: c2c427f6bb
Change-Id: I0074c6b81e9ebf2221325b1fbacb0057a75bb742
2020-05-19 18:10:24 +00:00
Treehugger Robot
c2c427f6bb Merge "Delete deps-license target." 2020-05-19 17:56:53 +00:00
Yo Chiang
06d81cc30a Merge "Refactor bitness resolving logic of product-installed-files" am: 502606f8ce am: 395e91dba5
Change-Id: Ia2b98f97cf06b7c0854e9f0aebd8c6389297b84e
2020-05-19 03:46:15 +00:00
Yo Chiang
395e91dba5 Merge "Refactor bitness resolving logic of product-installed-files" am: 502606f8ce
Change-Id: Idfaf7c79f08b1dbd2f64122b91ff7d44d862f1f1
2020-05-19 03:28:28 +00:00
Yo Chiang
502606f8ce Merge "Refactor bitness resolving logic of product-installed-files" 2020-05-19 03:17:29 +00:00
Bob Badour
a553cc828e Delete deps-license target.
If used, the results would be inaccurate in any case.

Test: treehugger

Change-Id: I3fdd76bf7d97f6a9f40bccbf437986e5bb7e9e88
2020-05-18 16:50:47 -07:00
Treehugger Robot
c4730e4efa [automerger skipped] Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" am: 8074729bc2 am: 865b8b8989 -s ours
am skip reason: Change-Id I68b0f9bd22e50c2a86e0dbe62abc17991581703e with SHA-1 95de4601b9 is in history

Change-Id: I3d1ea466e05f44b1facc4332e7767aef7bd5ca9e
2020-05-18 21:40:07 +00:00
Treehugger Robot
865b8b8989 Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" am: 8074729bc2
Change-Id: Ia8275ccf8ca204af8191b3d0f6a38e1b93cc56c1
2020-05-18 21:27:46 +00:00
Treehugger Robot
8074729bc2 Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" 2020-05-18 21:17:52 +00:00
Roman Kiryanov
6e0c857fe2 Import the d/g/goldfish soong namespace for libwifi-hal-emu
Some devices refer to libwifi-hal-emu via

BOARD_WLAN_DEVICE := emulator

we need to import the device/generic/goldfish
namespace to link the libwifi-hal-emu symbol.

Bug: 154151802
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
Merged-In: I68b0f9bd22e50c2a86e0dbe62abc17991581703e
2020-05-18 09:46:25 -07:00
TreeHugger Robot
cb1a26ac0b [automerger skipped] Merge "Enables signing for generic boot images" into rvc-dev am: 2fc5a393e0 -s ours
am skip reason: Change-Id I2fd69964f9dc62526a813875fa9193913aa4935b with SHA-1 0f95ac7e8c is in history

Change-Id: Ieb8e48b1deceae6529793aae35bb1511d12ef922
2020-05-18 05:56:30 +00:00
TreeHugger Robot
2fc5a393e0 Merge "Enables signing for generic boot images" into rvc-dev 2020-05-18 05:32:35 +00:00
TreeHugger Robot
dfbff3a4c6 Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into rvc-dev am: 2cde78687d
Change-Id: Ib6c1a7a365012cf5f1ba96c40a2ebb869f08accb
2020-05-18 04:36:27 +00:00
TreeHugger Robot
2cde78687d Merge "Move BOARD_EXT4_SHARE_DUP_BLOCKS to BoardConfigMainlineCommon.mk" into rvc-dev 2020-05-18 04:16:41 +00:00
Yo Chiang
bcd45cf3bb Merge "Access ALL_MODULES subvars with my_register_name" am: ca6e50fa2c am: a16d39fe25
Change-Id: Iea4d6198e40cd500bf548e20f1aee8239c269ade
2020-05-18 04:06:33 +00:00
TreeHugger Robot
387689574a Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" into rvc-dev am: 9a004c6371
Change-Id: If0d84e352a57368cea59e51a3414ab131d3d90f7
2020-05-18 04:00:21 +00:00
Yo Chiang
a16d39fe25 Merge "Access ALL_MODULES subvars with my_register_name" am: ca6e50fa2c
Change-Id: I47ab83a327e70e41038a3c2ae1a2e2439306b300
2020-05-18 03:53:58 +00:00
TreeHugger Robot
9a004c6371 Merge "Import the d/g/goldfish soong namespace for libwifi-hal-emu" into rvc-dev 2020-05-18 03:50:26 +00:00
Yo Chiang
ca6e50fa2c Merge "Access ALL_MODULES subvars with my_register_name" 2020-05-18 03:41:23 +00:00
Treehugger Robot
e18d90b28e Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" am: 203fd77042 am: b72fa3aaf6
Change-Id: I5ec86e149d8a5ec6dacc56afce1cfae81e714f5c
2020-05-18 02:28:33 +00:00
Treehugger Robot
b72fa3aaf6 Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" am: 203fd77042
Change-Id: I939b4d3da99d36b715160dd29fa12ebb45d426bd
2020-05-18 02:07:21 +00:00
Treehugger Robot
203fd77042 Merge "Update auto-gen test config template with PARAMETERIZED_STRINGS placeholder" 2020-05-18 01:50:49 +00:00
Xin Li
0be49be8d8 [automerger skipped] Merge "DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master" into stage-aosp-master am: 0806a1fd2b -s ours
am skip reason: subject contains skip directive

Change-Id: I09512961967279045d7acd2516542e613d146f60
2020-05-17 23:57:14 +00:00
Xin Li
0806a1fd2b Merge "DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master" into stage-aosp-master 2020-05-17 23:44:01 +00:00
Xin Li
62ebb9454e DO NOT MERGE - Merge QQ3A.200605.002 into stage-aosp-master
Bug: 155771477
Change-Id: Iea80d9cdc27c7109d848f9fc2350aecf5da75ece
Merged-In: I115a68d442f4f3922f0353fae1aae3bf1c057903
2020-05-16 17:30:34 +00:00
Treehugger Robot
b95ba0c9e4 Merge "Remove /default.prop" am: 3528db55f3 am: c7f65d7c5f
Change-Id: I9f603141ac5a9fa0b046eaabd60dc965c8f7bdfd
2020-05-16 09:11:34 +00:00
Treehugger Robot
c7f65d7c5f Merge "Remove /default.prop" am: 3528db55f3
Change-Id: Iaf51cbea752f35c82500c0c0471e357ef2782826
2020-05-16 08:54:00 +00:00
Treehugger Robot
3528db55f3 Merge "Remove /default.prop" 2020-05-16 08:39:56 +00:00
TreeHugger Robot
04845500c9 [automerger skipped] Merge "DO NOT MERGE - Mark QQ3A.200410.001 as mergepoint." into stage-aosp-master am: 952dbfab45 -s ours
am skip reason: subject contains skip directive

Change-Id: Iff7cc7a8141a66d95c6c1f90424fc629e764f15d
2020-05-16 06:07:25 +00:00
TreeHugger Robot
952dbfab45 Merge "DO NOT MERGE - Mark QQ3A.200410.001 as mergepoint." into stage-aosp-master 2020-05-16 05:51:40 +00:00
Xin Li
8959313955 DO NOT MERGE - Mark QQ3A.200410.001 as mergepoint.
Change-Id: I5bec6233650a4c6728cb7cf7e89e126bb3df4873
2020-05-16 04:27:46 +00:00
TreeHugger Robot
a4b1363063 [automerger skipped] Merge "Don't check link type of Soong app JNI libraries" into rvc-dev am: b1e99dd0a1 -s ours
am skip reason: Change-Id I2f6824b180ccdd62c26497bdca527540ca22f0d7 with SHA-1 1c8d81e5d9 is in history

Change-Id: I0e4eb2886e1082b37f84a807140cb98936a7c923
2020-05-16 01:32:21 +00:00
TreeHugger Robot
b1e99dd0a1 Merge "Don't check link type of Soong app JNI libraries" into rvc-dev 2020-05-16 01:15:56 +00:00
Treehugger Robot
43a1f47168 Merge "vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args" am: ff58fe4874 am: 3e7dadb73b
Change-Id: Iedc7d3106ef877936075731d6559a6b0fc0fbfb0
2020-05-16 00:46:11 +00:00
Treehugger Robot
3e7dadb73b Merge "vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args" am: ff58fe4874
Change-Id: Ib9edd91c6500685affbb245b8c3be9296df74872
2020-05-16 00:33:23 +00:00
Treehugger Robot
ff58fe4874 Merge "vendor_boot: remove INTERNAL_MKBOOTIMG_VERSION_ARGS from mkbootimg args" 2020-05-16 00:17:20 +00:00
Paul Scovanner
710ca787b7 Update Security String to 2020-07-01 am: 4a475b4740 am: 69d4b8de13
Change-Id: I057865e892e6cd904b3bbb8bc1f9fdf695079f33
2020-05-15 23:04:05 +00:00
Tianjie
346227c1f7 Exclude vendor_boot in secondary payload am: 620437b2bf
Change-Id: Ie675841079b3854b90ca192cd26e063827a976cd
2020-05-15 23:03:37 +00:00
Paul Scovanner
69d4b8de13 Update Security String to 2020-07-01 am: 4a475b4740
Change-Id: I6df8e4cb400ec1c08c5ac6e2b36bd55c2b8fb15a
2020-05-15 22:36:48 +00:00
Tianjie
620437b2bf Exclude vendor_boot in secondary payload
The secondary payload is used by factory OTA to speed up the first
boot of the device. The payload should only contain bootloaders
images and the precompiled apps in system_other. Remove vendor_boot
to reduce the secondary payload size.

Bug: 156782745
Test: build a package with secondary payload
Change-Id: I3a9f6dda00a5aac038438065e2bc6483d71b5e95
(cherry picked from commit c385064d94)
2020-05-15 22:36:00 +00:00
Sasha Smundak
de4d92f44d [automerger skipped] Implement android_app_set module. am: 60d03bd7db -s ours
am skip reason: Change-Id I66edc5b423898a11dbba1c3d9796c7bd4d6b4428 with SHA-1 b30ff0a65b is in history

Change-Id: Ief4b4221501896ef20c04d55ea1e3b06d16011b9
2020-05-15 22:22:11 +00:00
Sasha Smundak
60d03bd7db Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
Merged-In: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-15 10:47:05 -07:00
Steve Muckle
903a1ca7e1 support different boot partition sizes in aosp_arm64
The different boot images in aosp_arm64 have different partition size
requirements. Add support for defining a partition size associated with
each boot image variant.

This support is limited to aosp_arm64 currently, which is built with
recovery-as-boot.

A previous version of this change did not update the boot-debug image
AVB logic with the required macro for multiple boot partition size
support. This is now required because the aosp-arm64 boot.img is
configured as a chained AVB partition.

Bug: 156036850
Bug: 155049180
Change-Id: I66b57de91042bfd56ba54a3659843d8cf7873955
2020-05-15 10:16:17 -07:00
Colin Cross
41c3ad1f8b Don't check link type of Soong app JNI libraries
Link type checking is already done within Soong, and
SOONG_SDK_VARIANT_MODULES is not complete yet while parsing Soong
modules, skip JNI link type checking for Soong apps.

Bug: 156225490
Test: m checkbuild
Change-Id: I2f6824b180ccdd62c26497bdca527540ca22f0d7
Merged-In: I2f6824b180ccdd62c26497bdca527540ca22f0d7
(cherry picked from commit 1c8d81e5d9)
2020-05-15 10:09:57 -07:00
Jaewoong Jung
93b7ead4bf Merge "Implement android_app_set module." am: 8140bb1dc7 am: f1619724d0
Change-Id: I5cb4420ccfcde5624daac11ff9a9b34aadcb2372
2020-05-15 12:54:15 +00:00
Jaewoong Jung
f1619724d0 Merge "Implement android_app_set module." am: 8140bb1dc7
Change-Id: I8fba592225bdbca793bd1835cc80235eb4e91db7
2020-05-15 12:31:29 +00:00