Commit Graph

59066 Commits

Author SHA1 Message Date
Jiyong Park
b4233d19e8 ro.zygote in base_system.mk is optional am: 8d521ec2c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1344822

Change-Id: Idbd471ae8ac6883c81b457aa30d9943a312f8f2c
2020-07-01 01:59:24 +00:00
Jiyong Park
44fda3e29e Don't inherit tablet-dalvik-heap for GSI and emulator am: 8b266f16a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1344821

Change-Id: Ide2740f539da8ae56f02728828741e026e4f9599
2020-07-01 01:59:22 +00:00
Jiyong Park
54403635a4 Support optional prop assignments am: d721e870bc
Original change: https://android-review.googlesource.com/c/platform/build/+/1344820

Change-Id: I22fbe3645aff1b61a7e42d374cca240e9fe2259a
2020-07-01 01:59:20 +00:00
Treehugger Robot
91fd2d719e Merge "build.prop for ODM partition is under ./etc subdir" am: 3a3d501e11
Original change: https://android-review.googlesource.com/c/platform/build/+/1351282

Change-Id: Id5cd098b19f9bb97dc3f692f3004c6e878fc1b1b
2020-07-01 01:36:00 +00:00
Treehugger Robot
3a3d501e11 Merge "build.prop for ODM partition is under ./etc subdir" 2020-07-01 01:16:44 +00:00
Inseob Kim
572072b09f Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" am: b9a27f4e7d
Original change: https://android-review.googlesource.com/c/platform/build/+/1350002

Change-Id: I7e35dc40a4905f53b4106f4aeeae4d7c3cb114de
2020-07-01 00:38:04 +00:00
Inseob Kim
b9a27f4e7d Merge "Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION" 2020-07-01 00:27:44 +00:00
Treehugger Robot
e68d12bad2 Merge "use first kernel when generating kernel configs file" am: 6c9441a924
Original change: https://android-review.googlesource.com/c/platform/build/+/1351284

Change-Id: Iaa8c1c82e75b1c27c36dd6f845e70073d3a34539
2020-06-30 17:55:55 +00:00
Treehugger Robot
6c9441a924 Merge "use first kernel when generating kernel configs file" 2020-06-30 17:36:01 +00:00
Yo Chiang
156fa7335a Merge "Resolve module bitness for target-host required modules" am: c9b0f0a9a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1344818

Change-Id: I49504f9817f63933f96cd705d910b561b1665a69
2020-06-30 11:31:11 +00:00
Yo Chiang
c9b0f0a9a5 Merge "Resolve module bitness for target-host required modules" 2020-06-30 11:21:03 +00:00
Jiyong Park
8d521ec2c8 ro.zygote in base_system.mk is optional
The setting of ro.zygote in base_system.mk is optional, which means the
value can be overriden by other (probably more specific) mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
(cherry picked from commit b1261aac33)
Change-Id: Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4
2020-06-30 18:44:17 +09:00
Jiyong Park
8b266f16a9 Don't inherit tablet-dalvik-heap for GSI and emulator
GSI and emulator should not be specialized for tablet.

This is also to avoid the expected sysprop conflict after
I9c073a21c8257987cf2378012cadaeeeb698a4fb gets in. With the change,
duplicate assignments of a sysprop is prohibited. We currently have the
duplication due to the following hierarchy chain:

aosp_arm64.mk
 -> emulator_vendor.mk -> goldfish/vendor.mk -> phone-xhdpi-2048-dalvik-heap.mk
 -> generic_arm64/device.mk -> tablet-dalvik-heap.mk

Many of the dalvik.vm.* properties are duplicated between phone-*-
dalvik-heap.mk and tablet-dalvik-heap.mk files.

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I4d1e2f819fe688a4a85e58387b6af58d603399d3
(cherry picked from commit 9f2f6dd9c9)
Change-Id: I4d1e2f819fe688a4a85e58387b6af58d603399d3
2020-06-30 18:44:11 +09:00
Jiyong Park
d721e870bc Support optional prop assignments
This CL adds a number of changes to make the assignment of system
properties to be less confusing.

1. Added `a ?= b` syntax, which is called optional prop assignments. The
prop `a` gets the value `b` only when there is no non-optional prop
assignment for `a` such as `a = c`. This is useful for props that
provide some reasonable default values as fallback.

2. With the introduction of the optional prop assignment syntax,
duplicated non-optional assignments is prohibited; e.g., the follwing
now triggers a build-time error:

a = b
a = c

, but the following doesn't:

a ?= b
a = c

Note that the textual order between the optional and non-optional
assignments doesn't matter. The non-optional assignment eclipses the
optional assignment even when the former appears 'before' the latter.

a = c
a ?= b

In the above, `a` gets the value `c`

When there are multiple optional assignments without a non-optional
assignments as shown below, the last one wins:

a ?= b
a ?= c

`a` becomes `c`. Specifically, the former assignment is commented out
and the latter is converted to a non-optional assignment.

3. post_process_props.py is modified so that when a prop assignment is
deleted, changed, or added, the changes are recorded as comments. This
is to aid debugging. Previously, it was often difficult to find out why
a certain sysprop assignment is missing or is added.

4. post_process_prop.py now has a unittest

Bug: 117892318
Bug: 158735147
Test: atest --host post_process_prop_unittest

Exempt-From-Owner-Approval: cherry-pick from master

Merged-In: I9c073a21c8257987cf2378012cadaeeeb698a4fb
(cherry picked from commit 7aeb8de74e)
Change-Id: I9c073a21c8257987cf2378012cadaeeeb698a4fb
2020-06-30 18:44:01 +09:00
Dan Willemsen
55917b89a6 Merge "Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list" am: 4d1284c0b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1309873

Change-Id: Ib860df019c1de8680495ae039d15c14719a297e6
2020-06-27 22:22:39 +00:00
Dan Willemsen
4d1284c0b7 Merge "Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list" 2020-06-27 22:10:58 +00:00
Treehugger Robot
64ab409f71 Merge "Mark android_app_set modules PRESIGNED." am: 1e6cc9fc30
Original change: https://android-review.googlesource.com/c/platform/build/+/1351283

Change-Id: I4be6517c8d2d732aeed1e3ccd1e20a990f666a62
2020-06-27 01:13:27 +00:00
Treehugger Robot
1e6cc9fc30 Merge "Mark android_app_set modules PRESIGNED." 2020-06-27 01:01:40 +00:00
Steve Muckle
bbdfbdad50 use first kernel when generating kernel configs file
If multiple kernels are defined for a build, use the first one when
generating the kernel config file.

Bug: 159975506
Change-Id: Ia136264eb0d0b544bf0685bc22e600de187a9a9b
2020-06-26 16:39:34 -07:00
Jaewoong Jung
ddae589b95 Mark android_app_set modules PRESIGNED.
Test: m apkcerts-list
Fixes: 159921591
Merged-In: Ie83a05be0d71280644843eddffdbea6bcb429c74
Change-Id: Ie83a05be0d71280644843eddffdbea6bcb429c74
2020-06-26 16:10:49 -07:00
Luca Stefani
c158e421ec Remove empty new-space in dynamic_partition_list and super_$(group)_partition_list
* As a side product .strip() calls in releasetools are redunant,
  but since these scripts are also used out of tree we can't
  remove them to guarantee compatibility

Test: m dist
Change-Id: I5c513a4654e293c3d4eab98c8759ea094015fab1
2020-06-26 19:52:52 +02:00
Tianjie Xu
ffe526f246 Merge "Rename the boot image for avb validation" am: b829269aa1
Original change: https://android-review.googlesource.com/c/platform/build/+/1350723

Change-Id: Ic2cfb34560e9a8b16487017ff10d6a2e0fb98cd9
2020-06-26 17:52:46 +00:00
Tianjie Xu
b829269aa1 Merge "Rename the boot image for avb validation" 2020-06-26 17:35:54 +00:00
Inseob Kim
2b0b3d1491 Error if BOARD_VNDK_VERSION=PLATFORM_VNDK_VERSION
"BOARD_VNDK_VERSION := current" should be used instead.

Bug: 159866756
Test: manual
Change-Id: I854ca9c0fa195ab4bbb468a1343ef4fa28ac9258
2020-06-27 00:18:12 +09:00
Ulyana Trafimovich
8969520e35 Merge "Move construct_context.sh from Make to Soong." am: 43774f74c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1348850

Change-Id: Icaeba52a9e55841bcbab2a0831121142363ebd5c
2020-06-26 09:00:15 +00:00
Ulyana Trafimovich
43774f74c3 Merge "Move construct_context.sh from Make to Soong." 2020-06-26 08:46:58 +00:00
Tianjie
5ec1a7a66a Rename the boot image for avb validation
Starting from http://go/aog/1328118, we chained the 1st GKI
boot image into vbmeta. However, this fails avb validation;
because the avbtool constructs the image path based by using
"partition name + ext".

This cl works around the issue by renaming boot-5.4.img to
boot.img, so avbtool can find the image correctly.

Bug: 159656873
Test: run validate target file
Change-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
2020-06-25 23:09:48 -07:00
Jiyong Park
62117c857d build.prop for ODM partition is under ./etc subdir
build.prop for the ODM partition should be placed under ./etc directory
to support GSI. For detailed reasons, see
I0733c277baa67c549bb45599abb70aba13fbdbcf

The path was changed to /odm/build.prop during the recent refactoring
around build.prop filems and this change fixes the mistake.

Bug: 132128501

Test: check if odm/etc/build.prop is created
Change-Id: Icc2c564250aa08786f32294a839cc81e86b7d368
2020-06-26 09:59:42 +09:00
Treehugger Robot
f9bd377168 Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" am: bfe947b5ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1348976

Change-Id: I7b0930b126a3a1eeeef28566a442e7be9b04a44d
2020-06-25 19:31:14 +00:00
Treehugger Robot
bfe947b5ce Merge "depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD" 2020-06-25 19:23:39 +00:00
Mark Salyzyn
46a9c028b8 depmod: pair in a modules.load.charger on BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD
If the BoardConfig defined BOARD_VENDOR_KERNEL_MODULES_LOAD and
BOARD_VENDOR_CHARGER_KERNEL_MODULES_LOAD, generate both a
modules.load and modules.load.charger respectively on
/vendor/lib/modules.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 159424228
Bug: 151950334
Test: build, confirm, change to charger mode, confirm set of modules loads
Change-Id: I55677ed74d80ff3909fe8cbe26e6766f9b5283d5
2020-06-25 08:57:36 -07:00
Ulya Trafimovich
5a7defdab1 Move construct_context.sh from Make to Soong.
This script belongs with other manifest-related scripts, and the future
plan is to rewrite it in Python and share common functionality with
other scripts.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I4b90129e5023ca1a2c818fc160c34b0b7da943ef
2020-06-25 14:48:08 +01:00
Tianjie Xu
387907b462 Merge "Add lz4 to otatools" am: be46f482e0
Original change: https://android-review.googlesource.com/c/platform/build/+/1348968

Change-Id: I98d770f1bed209fe54a6eb5bface78b973f145a5
2020-06-24 23:54:08 +00:00
Tianjie Xu
be46f482e0 Merge "Add lz4 to otatools" 2020-06-24 23:38:49 +00:00
Colin Cross
09ee73f2a7 Merge "Use inclusive language in build/make part 2" am: e1ab4cb610
Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: I73962b9319367a5305ff35f16b0dad3a4e482ae0
2020-06-24 22:09:24 +00:00
Colin Cross
e1ab4cb610 Merge "Use inclusive language in build/make part 2" 2020-06-24 21:58:46 +00:00
Kelvin Zhang
36b5ebb1cf Merge "Fix lint errors in ota_from_target_files script" am: c8b4784cb9
Original change: https://android-review.googlesource.com/c/platform/build/+/1348022

Change-Id: I8bc28e4f7b283d1d34dd90ca4f05309585326277
2020-06-24 19:32:29 +00:00
Kelvin Zhang
c8b4784cb9 Merge "Fix lint errors in ota_from_target_files script" 2020-06-24 19:17:35 +00:00
Colin Cross
d1cbfeaa3a Use inclusive language in build/make part 2
Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
2020-06-24 12:03:08 -07:00
Tianjie
3031c29905 Add lz4 to otatools
A call to lz4 was added in http://go/aog/1329115. But the binary
isn't added to otatools, leading to a signing failure.

Bug: 159656873
Test: build otatools
Change-Id: I9cab00f36ce3c39cc174b4c9feffdf360f0364ef
2020-06-24 11:20:36 -07:00
Kelvin Zhang
0876c410ad Fix lint errors in ota_from_target_files script
Only changes code styles, should be No-op to functionality

Test: Run unit tests
Bug: 159723838
Change-Id: Icf6146eb0d6b3fb66478709c0edf55bce54db68f
2020-06-24 09:21:35 -04:00
Roland Levillain
053e972a22 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." am: 4a203a6326
Original change: https://android-review.googlesource.com/c/platform/build/+/1328973

Change-Id: I70dba2218f426c7bba388433593d89516fadd6c3
2020-06-24 10:32:14 +00:00
Roland Levillain
4a203a6326 Merge "Warn about the use of COVERAGE_PATHS and COVERAGE_EXCLUDE_PATHS." 2020-06-24 10:16:03 +00:00
Colin Cross
c018eacb4e Merge "Rename Native_coverage to GcovCoverage in Soong" am: 5c0acab3e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1340937

Change-Id: Ia009dc13662e87b7f8494849f7d9f35442c9af9d
2020-06-23 03:19:51 +00:00
Colin Cross
5c0acab3e2 Merge "Rename Native_coverage to GcovCoverage in Soong" 2020-06-23 03:06:53 +00:00
Treehugger Robot
9fdd152da4 Merge "Remove vts10 dependencies" am: 8eba18759b
Original change: https://android-review.googlesource.com/c/platform/build/+/1314951

Change-Id: Ifdf17812c4d3793e0eff3a58750d89f5b0005fa1
2020-06-23 02:26:46 +00:00
Treehugger Robot
8eba18759b Merge "Remove vts10 dependencies" 2020-06-23 02:11:30 +00:00
Ryan Prichard
4b5c043b93 Merge "Unlist libunwind as a critical component" am: b636b0cfb8
Original change: https://android-review.googlesource.com/c/platform/build/+/1344920

Change-Id: Idc879fe65542d3420d11dfa3034dd48f86508a55
2020-06-22 21:33:30 +00:00
Ryan Prichard
b636b0cfb8 Merge "Unlist libunwind as a critical component" 2020-06-22 21:17:07 +00:00
J. Avila
422a1aec8a Merge "Switch to using llvm-strip for modules" am: dbbd970d18
Original change: https://android-review.googlesource.com/c/platform/build/+/1344918

Change-Id: Iefe8adb2005317c76179efbbf12f16579efe4c41
2020-06-22 15:35:36 +00:00