Commit graph

68689 commits

Author SHA1 Message Date
David Anderson
d4bea32530 Merge "Fix generate-userimage-prop-dictionary getting called unnecessarily." 2021-08-30 23:17:16 +00:00
David Anderson
17063cfcb0 Fix generate-userimage-prop-dictionary getting called unnecessarily.
odm, odm_dlkm, vendor_dlkm call generate-userimage-prop-dictionary. This
appears to be inadvertent as it pulls in props from all the other
partitions. Instead, call generate-image-prop-dictionary which is
specific to one partition.

Bug: 198001223
Test: builds, treehugger green
Change-Id: Ib177c740068f1c087d517b363649551092038760
2021-08-27 16:50:30 -07:00
Treehugger Robot
d5b993bac7 Merge "Add missing custom kernel module targets" 2021-08-27 19:37:36 +00:00
Saravana Kannan
d6dc4a1d3b Merge "Strip recovery kernel modules by default" 2021-08-27 19:30:15 +00:00
Mark-PK Tsai
3ec61b4730 Add missing custom kernel module targets
Custom kernel module targets are not in the build dependency rule
which cause the copy command of $(my_copy_pairs) fail.
Add it back to $(my_image_copy_files) and remove the prefixed
$(my_staging_dir) from dest of kernel module copy pair.
Then the makefile can handle it well.

Bug: 195888474
Change-Id: Id8cb4c4991905e8bc53ddb5e60e87a36fe43e803
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-26 15:41:01 +08:00
Colin Cross
ee20ae1a8d Merge "Propagate USE_HOST_MUSL to Soong" 2021-08-26 05:12:15 +00:00
Colin Cross
178de6308c Propagate USE_HOST_MUSL to Soong
Support enabling musl in Make builds with USE_HOST_MUSL=true.  Only
modules defined in Soong will use musl, but that's almost all host
modules.

Bug: 195988762
Test: m USE_HOST_MUSL=true adb
Change-Id: Ia88f6e20b302d86f2241877b017aebe218d968cf
2021-08-25 15:07:17 -07:00
Sophie Zheng
8f863178da Merge "API coverage Copy generated API list during building cc_library to cc_apis/" 2021-08-25 21:42:44 +00:00
Alexander Smundak
f80b8930f0 Merge "Add product-copy-files-by-pattern" 2021-08-24 20:49:27 +00:00
Sasha Smundak
d189ab71f3 Add product-copy-files-by-pattern
Several configuration makefiles in the internal
source tree use this pattern

Bug: 190051051
Test: treehugger
Change-Id: Ifab4a7022b9c337966f46e098147fbb5817d9343
2021-08-24 20:49:01 +00:00
Alexander Smundak
ed266e5fb8 Merge "Fix add_soong_config_namespace/add_soong_config_var macros" 2021-08-24 16:03:51 +00:00
Treehugger Robot
f72c0facd3 Merge "Add a prompt to try out RBE for local builds" 2021-08-23 20:57:30 +00:00
Kousik Kumar
09af254c8f Add a prompt to try out RBE for local builds
This is to nudge developers to use RBE especially when they run into
long builds and do NOT have RBE turned on.

Change-Id: I7da94763f5387310e522931bf650f9d7c01dc7f2
2021-08-23 14:55:35 -04:00
Treehugger Robot
cc303becee Merge "Add zucchini to otatools.zip" 2021-08-23 15:50:39 +00:00
Mark-PK Tsai
8c54396580 Strip recovery kernel modules by default
Strip recovery kernel modules by default which make
recovery.img smaller.
Also, add BOARD_DO_NOT_STRIP_RECOVERY_MODULES to make
it configurable like vendor modules did.

Change-Id: Id4e8c88b91dad38afc1fec5eae83fcb29c825be3
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
2021-08-23 18:04:05 +08:00
Sasha Smundak
4a94bb884a Fix add_soong_config_namespace/add_soong_config_var macros
They were failing with an argument containing whitespace. That is,
calling `$(call add_soong_config_namespace, foo)` would result in
the attempt to assign to an empty variable. It went unnoticed
because `ckati` silently ignores such an assignment (`make` is
more diligent and fails).

Bug: 190051051
Test: treehugger
Change-Id: Ifcc168eaf2db725e705887889e732bcd4410db39
2021-08-20 11:18:32 -07:00
Kelvin Zhang
b673bbfbb2 Add zucchini to otatools.zip
Zucchini is a new diffing algorithm we plan to add to Android OTA, add
it to otatools.zip first.

Bug: 194237829
Test: th
Change-Id: I9561101decc2d13afb0a8d4329c3ecc044c96c9d
2021-08-20 10:09:20 -07:00
Alexander Smundak
23d5ae4f6f Merge changes I2d61d966,Ic4315ce2
* changes:
  Fix copy_files implementation
  Add find_files builtin, use it to fix find_and_copy implementation
2021-08-20 15:44:42 +00:00
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
sophiez
c2ae0e5bbb API coverage
Copy generated API list during building cc_library to cc_apis/

Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/sophiez/my_dist_dir EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true SKIP_BOOT_JARS_CHECK=true

Change-Id: I05e6b7b9c9bbbab72718fd926ddda468bde05565
2021-08-17 14:59:36 -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