Commit graph

68648 commits

Author SHA1 Message Date
Kelvin Zhang
f0d9c940e4 Merge "Add a build prop for go/vabc-xor" 2021-08-09 14:58:57 +00:00
Kelvin Zhang
3645e89d8e Merge "Make apex util detect if hashtree is present" 2021-08-06 23:31:59 +00:00
Yifan Hong
59c4d75965 Merge "releasetools: better logs." 2021-08-06 20:09:28 +00:00
Kelvin Zhang
bcda23488c Add a build prop for go/vabc-xor
Allow each lunch target to control if they want to use this new feature.

Test: th
Change-Id: I10219a916bca258e669de051262f9ebba8434803
2021-08-06 11:51:41 -04:00
Kelvin Zhang
7cab7503e2 Make apex util detect if hashtree is present
Test: sign_target_fiels_apks oriole_target_files.zip
Bug: 195194430

Change-Id: I919d169ce4d66e6a1cdbfd15babde25005971a30
2021-08-06 11:51:37 -04:00
Alexander Smundak
420a93155a Merge changes I0ecafa41,Ic6173a96
* changes:
  Soong namespaces should be initialized
  Integrate Starlark-based configuration runner
2021-08-06 02:00:14 +00:00
Hajime Morrita
2ede665af0 Merge "Drop pinner.pin_camera=false from the default prop." 2021-08-05 15:59:22 +00:00
SzuWei Lin
32ccb49665 Merge "Always build modules in GSI from source" 2021-08-05 11:28:05 +00:00
SzuWei Lin
8c63356702 Always build modules in GSI from source
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.

Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
2021-08-05 08:51:54 +00:00
Yifan Hong
a4140d22df releasetools: better logs.
Bug: 195481978
Test: none
Change-Id: I86edfa653715dbbfab22ea29f4fd9e64fc57ef5a
2021-08-04 18:09:15 -07:00
Sasha Smundak
596874af42 Soong namespaces should be initialized
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I0ecafa41b462998e0bb386680683a798ae5c46e7
2021-08-04 17:25:44 -07:00
Sasha Smundak
8d97bf5327 Integrate Starlark-based configuration runner
If RBC_PRODUCT_CONFIG variable is set, obtain product configuration
variables by converting product configuration makefiles to Starlark
files and then executing them.
Also, introduce RBC_NO_PRODUCT_GRAPH variable to suppress product graph
generation. We cannot generate product graph with Starlark, so this
option allows to verify that the rest of the contents of the generated
Ninja files remains the same when Starlark-based converter is used.
This allows to perform the regression testing, i.e. running
`RBC_NO_PRODUCT_GRAPH=t DISABLE_ARTIFACT_PATH_REQUIREMENTS=t m nothing`
and
`RBC_PRODUCT_CONFIG=t m nothing`
should generate identical *.ninja files.

Bug: 181797530
Test: Manual
Change-Id: Ic6173a9640f32766b71c02a2b1833ce7a278e4cc
2021-08-04 17:15:16 -07:00
Hajime Morrita
1210b6efa8 Drop pinner.pin_camera=false from the default prop.
The pin_camera flag being false makes some in-market devices
(redfin, bramble, coral, etc.) not pin the camera app by default.
Although a Phenotype flag overrides this value,
the OTA flag delivery can fail and ends up non-ping state.

This change makes sure that the device pins the camera app by default
by removing pinner.pin_camera properties modification from this file.
The current default is to pin the camera. See PinnerServices.java

Note that the camera pinning is still disabled on crosshatch family,
sicne it is known to be prone to the memory shortage.
See device-crosshatch.mk.

Also note that some newer devices already pin by default because
they don't refer this file, although the name implies it might.

Test: On Redfin:
  $ vendor/google/tools/flashall -w
  $ adb root && adb wait-for-device && adb shell am start -a com.android.setupwizard.FOUR_CORNER_EXIT
  $ adb shell dumpsys pinner
Bug: 195035033
Bug: 184897981
Merged-In: I81207d0527f758d4800319a3a3c323919daaf814
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
2021-08-04 12:06:50 -07:00
Xin Li
ec37feb519 Merge "Rename T to Tiramisu" 2021-08-04 08:27:34 +00:00
Treehugger Robot
a0c41b15b8 Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." 2021-08-04 01:05:56 +00:00
Xin Li
718d59849e DO NOT MERGE - Merge RQ3A.210805.001.A1.
Bug: 192585466
Merged-In: Ieba9625ca0ccedf285209954f1e766b20455c32f
Change-Id: I23e660c8ee9ab25fe966abaf88891cc3540a860e
2021-08-03 16:27:24 -07:00
Mathew Inwood
0361b625f2 Merge "Fix typo." 2021-08-03 09:27:41 +00:00
Bowgo Tsai
23ae3dcbe1 Merge "Adding vendor_boot-test-harness.img" 2021-08-03 06:07:13 +00:00
Mathew Inwood
87c4655f07 Fix typo.
Test: m

Change-Id: I6a85ea59bb6d6babd6979de22a944e8751ea287f
2021-08-02 15:00:10 +01:00
Treehugger Robot
d332f155aa Merge changes I3682ae9a,Id29e273c
* changes:
  Don't use prebuilt modules for sanitizer builds.
  Don't use mainline prebuilts for coverage builds.
2021-08-02 13:27:38 +00:00
Mathew Inwood
99dffee4c6 Don't use prebuilt modules for sanitizer builds.
Prebuilt modules do not provide sanitizer binaries to using them in this
context is unsafe.

Bug: 194067130
Test: TH
Merged-In: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
Change-Id: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
2021-08-02 13:27:39 +01:00
Mathew Inwood
945184174c Don't use mainline prebuilts for coverage builds.
Test: TH
Bug: 192556458
Bug: 159241638
Merged-In: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
Change-Id: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
2021-08-02 13:25:03 +01:00
Anton Hansson
9673304335 Merge "Fix typo for ODM prop files" 2021-07-30 14:31:46 +00:00
SzuWei Lin
67155335e1 Merge "Move init.vndk-*.rc to system_ext/etc/gsi" 2021-07-30 13:57:06 +00:00
Hidefumi Kaneko
b09a36c8eb Fix typo for ODM prop files
_prop_files is missing a trailing _

Bug: 195034733
Test: manual - check that expected prop files are in the image
Change-Id: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
2021-07-30 12:07:40 +02:00
SzuWei Lin
f36ea80ea3 Move init.vndk-*.rc to system_ext/etc/gsi
Orgianlly, init.vndk-*.rc are placed under system_ext/etc/init.
`init` always run all thse .rc files. The patch move these .rc
files to system_ext/etc/gsi to avoid the problem.

Bug: 185457479
Test: build gsi_arm64-userdebug; check the files under system_ext/
Change-Id: Iee67d6e2e872cf3cb1dd1014925ed0249c1e7e2d
2021-07-30 17:33:50 +08:00
Alexander Smundak
5f75aafb00 Merge "Implement copy_files function" 2021-07-30 01:56:27 +00:00
Alexander Smundak
510c0014d5 Merge changes I129136e8,I278bd8ed,I1d22ed6f
* changes:
  Implement add_soong_namespace and add_soong_config_var_value functions
  Trim spaces in the rule actions
  Add copy-files macro
2021-07-30 01:56:01 +00:00
Bowgo Tsai
87f60017b9 Adding vendor_boot-test-harness.img
boot-test-harness.img is used to allow adb root on user build
images. It also sets properties: ro.audio.silent=1 & ro.test_harness=1.

GKI 2.0 devices will use BOARD_PREBUILT_BOOTIMAGE so
boot-test-harness.img will not be generated.

Therefore, we have to introduce the vendor_boot-test-harness.img
as an alternative for boot-test-harness.img.

In the future, we'll simplify the flow as:
  + If a device has a /vendor_boot partition, builds
    vendor_boot-(test-harness|debug).img.
  + Otherwise, builds boot-(test-harness|debug).img.

boot-(test-harness|debug).img needs to be kept for some clients
to gracefully transit to using vendor_boot-(test-harness|debug).img.

Bug: 194654549
Test: make then `unpack_bootimg --boot_img $OUT/vendor_boot-test-harness.img`
Test: Check the ramdisk content in ./out/vendor_ramdisk

Change-Id: If3a1393b4ff3e69bb9b62f3b843b7858437d47bf
2021-07-30 00:54:47 +00:00
Sasha Smundak
a93e3d9985 Implement copy_files function
Bug: 193540681
Test: treehugger
Change-Id: Iffc64551e733747a9a29c14b1f674b3a533f44ba
2021-07-29 11:42:29 -07:00
Sasha Smundak
c106138baf Implement add_soong_namespace and add_soong_config_var_value functions
Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I129136e83d2d00ef5b64d3aab07b98719198dcfe
2021-07-29 11:24:35 -07:00
Sasha Smundak
0e4a5ad24b Trim spaces in the rule actions
When rule action contains something like
  cp $(FOO) ...
and FOO is set with
FOO := a \
 b \

the generated Ninja file constains extra spaces, making it
difficult to compare it to the same file generated by the
Starlark-based product configuration.

Bug: 181797530
Test: manual
Change-Id: I278bd8edf0f017a31c5b5115b2a38f4f663c55fc
2021-07-29 10:57:06 -07:00
Sasha Smundak
31b6b9442a Add copy-files macro
To allow refactoring a lot of product configuration makefiles.

Bug: 190051051
Test: treehugger
Change-Id: I1d22ed6f3df17fb616bd272c0d928aa1fdb9729a
2021-07-29 10:57:06 -07:00
satayev
72602c4687 Merge "Rename UpdatableSystemServerJars to ApexSystemServerJars." 2021-07-29 11:23:43 +00:00
Kelvin Zhang
8ee181df52 Merge "Fix a bug in computing streaming property of payload.bin" 2021-07-28 21:51:49 +00:00
Kelvin Zhang
25ab998d82 Fix a bug in computing streaming property of payload.bin
When computing the data offset of an entry in zip file, we used length
of extra field from central directory. That is correct most of the time
but wrong if the extra field in central directory has different length
than the one in local file directory. Since python's zipfile doesn't
provide an API to access local file header, we need to parse local file
header ourselves and extract length of extra field.

An incorrect offset will cause magic mismatch error from update_engine,
as update_engine expects to find uncompressed payload at the recorded
offset.

Test: th, partner verification
Bug: 191443484

Change-Id: Id670cd79b0bd65adffaaa5224ae4f8065d66b358
2021-07-28 11:40:18 -04:00
satayev
ed0817932b Rename UpdatableSystemServerJars to ApexSystemServerJars.
This is consistent with naming for boot jars, e.g. ApexBootJars.

Bug: 191127295
Test: presubmit
Change-Id: I1d4378e0d2dc73af2ffd8c4cc66ab8c0e2981d2f
2021-07-28 14:03:57 +01:00
Roland Levillain
7b763f0d46 Merge "Add extra owners for file core/tasks/art-host-tests.mk." 2021-07-28 12:51:01 +00:00
satayev
96fa127572 Merge "Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS." 2021-07-28 10:36:39 +00:00
Roland Levillain
add7902aab Merge "Work around art-host-tests build issues when using ART prebuilts." 2021-07-28 09:29:49 +00:00
Roland Levillain
6db8228316 Add extra owners for file core/tasks/art-host-tests.mk.
Test: build/make/tools/checkowners.py -c build/make/core/tasks/OWNERS
Bug: 169111770
Change-Id: I6dbbabd35386d806a786e1d895070bb2c19fa2c6
2021-07-28 10:21:56 +01:00
Jooyung Han
6c4e8d5f97 Merge "cleanup: remove unnecessary steps in apex_utils" 2021-07-28 00:56:41 +00:00
satayev
a85d5225ee Rename PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to PRODUCT_APEX_SYSTEM_SERVER_JARS.
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
2021-07-27 16:09:52 +00:00
Roland Levillain
4d9d0aa86c Work around art-host-tests build issues when using ART prebuilts.
Using prebuilts of the ART Module seems to make
`COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES` empty on
x86 targets, thus breaking the `art-host-tests` build target. As
a workaround, relax the corresponding build rule to allow for an
empty `COMPATIBILITY.art-host-tests.HOST_SHARED_LIBRARY.FILES`
list.

Test: lunch cf_x86_phone-userdebug
        && SOONG_CONFIG_art_module_source_build=false m art-host-tests
Bug: 194627489
Change-Id: I9e885be3c7161f6f09a93b3d32339a5a6e57d2a1
2021-07-27 15:00:48 +01:00
Kelvin Zhang
7fd6933e90 Merge "Skip vbmeta_system if it doesn't exist" 2021-07-27 13:18:49 +00:00
Kelvin Zhang
a19fb315e0 Skip vbmeta_system if it doesn't exist
Test: validate_target_files bonito-target_files-7582772.zip
Change-Id: I2da4f5a7897b1ef155e17441a8f5b97c0716d601
2021-07-27 09:17:05 -04:00
Jiyong Park
f253430313 Merge changes from topic "remove_ndk_platform"
* changes:
  Fix build
  Reland: *-ndk.so libraries are added to the VNDK set.
2021-07-27 01:01:58 +00:00
satayev
2bcf499b56 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Colin Cross
443105f6d1 Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
(cherry picked from commit a45d0c890e)
2021-07-26 09:42:50 -07:00
Colin Cross
47d36a96ad Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Merged-In: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
(cherry picked from commit 980089dab4)
(cherry picked from commit ee3ddc7159)
2021-07-26 11:25:24 +09:00