Commit Graph

60740 Commits

Author SHA1 Message Date
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
Paul Scovanner 902a6e18e0 Update Security String to 2020-07-05
Bug: 156652977
Change-Id: Ifee743bae79d21c096a95d608552fbb4260aff6c
2020-05-17 21:15:17 +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
Jaewoong Jung 8140bb1dc7 Merge "Implement android_app_set module." 2020-05-15 12:13:43 +00:00
Treehugger Robot 778727765f Merge "Don't check link type of Soong app JNI libraries" am: 642343975e am: 2f05acb7fe
Change-Id: Ieb2032ce11b64c66ae3584d32e28485c52338f53
2020-05-15 08:02:38 +00:00
Treehugger Robot 2f05acb7fe Merge "Don't check link type of Soong app JNI libraries" am: 642343975e
Change-Id: I03c813b616413826dbccbecc5cc89072481d293a
2020-05-15 07:42:57 +00:00
Treehugger Robot 642343975e Merge "Don't check link type of Soong app JNI libraries" 2020-05-15 07:17:42 +00:00
easoncylee 9425870f73 Update auto-gen test config template with PARAMETERIZED_STRINGS
placeholder

Bug: 134509111
Test: add "test_mainline_modules: [some.apk]" to TetheringTests,
and build the modules, confirm the parameterized option is added
in the test config.

Change-Id: I0f4f837412075520153d21c9ca12cf5c3f555de7
2020-05-15 11:43:43 +08:00
Treehugger Robot 8e8444d4fe Merge changes from topic "remove_default_prop" am: 4e0bce688c am: 09dd92a862
Change-Id: If12633a2be57ffbb42d0306193a226164e77e2d4
2020-05-15 02:51:58 +00:00
Treehugger Robot 09dd92a862 Merge changes from topic "remove_default_prop" am: 4e0bce688c
Change-Id: I6b1eb0ded64eda84b15f4c2a9e08d067f61142a4
2020-05-15 02:35:00 +00:00
Treehugger Robot 4e0bce688c Merge changes from topic "remove_default_prop"
* changes:
  Remove /system/etc/prop.default
  Remove /vendor/default.prop
2020-05-15 02:12:49 +00:00
Sasha Smundak b30ff0a65b Implement android_app_set module.
Bug: 152319766
Test: manual and builtin
Change-Id: I66edc5b423898a11dbba1c3d9796c7bd4d6b4428
2020-05-14 19:06:28 -07:00
Treehugger Robot b05afb3207 Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0 am: 16402667c4
Change-Id: I9ad800b0f5aad55eac82c802cbb6b1b5a1926245
2020-05-15 01:18:06 +00:00
Treehugger Robot 16402667c4 Merge "Fix _ImportParser() error if property is imported from oem partition." am: f774ae9aa0
Change-Id: I0c832af83237e72163be868551a5bcfbaf81e276
2020-05-15 00:59:04 +00:00
Treehugger Robot f774ae9aa0 Merge "Fix _ImportParser() error if property is imported from oem partition." 2020-05-15 00:39:52 +00:00
Roman Kiryanov 95de4601b9 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
2020-05-14 13:22:44 -07:00
Paul Scovanner 4a475b4740 Update Security String to 2020-07-01
Bug: 156652977
Change-Id: I81539bf9bd96bdc2e0bca54b506d8a6061f0bfba
2020-05-14 19:56:33 +00:00
Colin Cross 1c8d81e5d9 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
2020-05-14 12:50:52 -07:00
Hongguang Chen b4702b7006 Fix _ImportParser() error if property is imported from oem partition.
The oem partition allows system build.prop to import properties from it
by "import /oem/oem.prop xxxx". An _ImportParser() error was raised on
this case.

BUG: 154171021
Test: 1) "atest --host releasetools_test releasetools_py3_test -c"
      2) On a device who has oem partition, "make dist" and sign its
      target zip file.
Change-Id: I47875bf7a698390e11690150e6516a3064550ca0
2020-05-14 17:44:14 +00:00