Commit graph

68670 commits

Author SHA1 Message Date
Sasha Smundak
6797bfaac1 Fix copy_files implementation
It has to copy all the files into the same directory, stripping the
relative path from the source file.

Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: I2d61d966ad94d73131c7ad6016ce319f8d2ae509
2021-08-19 13:56:09 -07:00
Sasha Smundak
6b795dc6a5 Add find_files builtin, use it to fix find_and_copy implementation
The macro find-and-copy finds all the files in the given source tree that
match the given filename patten and create <source>:<dest> pair with the
same relative path in the destination tree.

Bug: 193540681
Test: rbcrun build/make/tests/run.rbc
Change-Id: Ic4315ce2fab7a7791ab55dd9eed039205a1c721a
2021-08-19 13:54:53 -07:00
Treehugger Robot
bb0d6a42d8 Merge "Fix kernel module build of custom image" 2021-08-18 21:22:05 +00:00
Treehugger Robot
f00fbb4ae4 Merge "Support product-copy-files-by-pattern macro" 2021-08-18 19:09:19 +00:00
Sasha Smundak
ed1f09cf4a Support product-copy-files-by-pattern macro
Bug: 193566316
Test: rbcrun build/make/tests/run.rbc
Change-Id: Idf462d7f58e8d4a6e8b3a1506306f9eb67130dc8
2021-08-18 09:28:04 -07:00
Treehugger Robot
82d34b6472 Merge "Most of the TARGET_COPY_OUT_xxx variables are not constant" 2021-08-17 13:05:31 +00:00
Martin Stjernholm
914c00fa80 Merge "Remove PRODUCT_BOOT_JAR_MODULE_OVERRIDES." 2021-08-17 08:53:02 +00:00
Sasha Smundak
412a0da66f Most of the TARGET_COPY_OUT_xxx variables are not constant
Bug: 193566316
Test: internal
Change-Id: I61ec23a927c3b8c340ce1930c88fe1837bdd35d1
2021-08-16 13:40:13 -07:00
Martin Stjernholm
36444ab0ec Remove PRODUCT_BOOT_JAR_MODULE_OVERRIDES.
This reverts commit efe6a4d748.

As a result of b/191269918, APEX variants are now consistently
identified by their "runtime names", i.e. their mount names under
/apex. Those names are now also used to identify the APEXes in
PRODUCT_BOOT_JARS and similar variables. That avoids implementing a
global lookup mechanism in Soong, and since they don't vary between
products also makes this override variable unnecessary.

Test: `m nothing` in internal
Bug: 191269918
Bug: 180325915
Change-Id: I6fd3d29d1c032c9f8bda0191781f9d2dc6f199a4
2021-08-15 22:30:03 +01:00
Treehugger Robot
1b181b0698 Merge "Respect VABC Xor prop in ota_from_target_files" 2021-08-13 03:28:25 +00:00
Kelvin Zhang
ad427381b9 Respect VABC Xor prop in ota_from_target_files
Test: generate ota on a non-vabc xor target, make sure it's not used
Change-Id: Ibdbcfe3775c96848c37c7f580121583d4bd57fce
2021-08-12 17:55:57 -07:00
Treehugger Robot
5a28a2af48 Merge "Add servicedispatcher to PRODUCT_PACKAGES_DEBUG." 2021-08-11 03:52:56 +00:00
Spandan Das
9c1806331d Merge "Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds" 2021-08-10 22:35:42 +00:00
Treehugger Robot
a21e1db314 Merge "definitions.mk: Detect bad zip files." 2021-08-10 16:48:51 +00:00
Alexander Smundak
f7162b39b5 Merge "Fix rblf_file_exists, it should return true for a directory, too." 2021-08-10 16:19:48 +00:00
Sasha Smundak
3c569799ca Fix rblf_file_exists, it should return true for a directory, too.
Fixes: 184278019
Test: internal
Change-Id: I68c3274a4540dd36e047d6c2027766dbe75d38f8
2021-08-10 09:12:56 -07:00
Devarshi Bhatt
4cc80241d3 Merge "Update language to comply with Android's inclusive language guidance" 2021-08-10 12:20:30 +00:00
LaMont Jones
e1af00ba56 definitions.mk: Detect bad zip files.
If the jar file passed to add-jar-resources-to-package is passed a
non-zipfile, then we should produce an error.

Bug: 153900481
Test: manual
Change-Id: Idc4dd9afd89eaee08a9e792dfa2a759e64b783fc
2021-08-09 19:32:51 +00:00
Kelvin Zhang
f0d9c940e4 Merge "Add a build prop for go/vabc-xor" 2021-08-09 14:58:57 +00:00
Mark-PK Tsai
1024d6a17f Fix kernel module build of custom image
Correct the build-image-kernel-modules arguments then
the board can use BOARD_{CUSTOM_IMAGE}_KERNEL_MODULES
to install kernel modules.

Bug: 195888474
Change-Id: I65124acc470e7f6f701bf3c9f5481bb2d688d555
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-09 14:05:04 +08: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
Spandan Das
289fb6cad0 Remove MODULE_BUILD_FROM_SOURCE=true for coverage builds
This flag will be selectively added to build targets if necessary

Bug: 193569756
Test: m nothing
Change-Id: Ie0fd898b03aa91322dddd9137b038031d46c8d24
2021-08-06 02:25:04 +00: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