Commit graph

66400 commits

Author SHA1 Message Date
Daniel Norman
016c7fa4a4 Merge "Runs host_init_verifier on merged target files packages." am: e9fdfb9fea
Original change: https://android-review.googlesource.com/c/platform/build/+/1497138

Change-Id: Id64e8461adc7ebd0d5c41f195c91284771fd5084
2020-11-25 18:29:15 +00:00
Daniel Norman
e9fdfb9fea Merge "Runs host_init_verifier on merged target files packages." 2020-11-25 18:13:30 +00:00
Chih-hung Hsieh
3692392864 Merge "Dump a new CSV with warning messages" am: 5364ffafa9
Original change: https://android-review.googlesource.com/c/platform/build/+/1502352

Change-Id: Ib20ddecbc1a2b15b0b2dbcad76b45e55e915266a
2020-11-25 17:51:02 +00:00
Chih-hung Hsieh
5364ffafa9 Merge "Dump a new CSV with warning messages" 2020-11-25 17:38:21 +00:00
Kousik Kumar
f16d798822 Switch default execution strategy to racing for developer builds
This is to efficiently use both local and remote resources when using
RBE for Android developers.

Bug: b/170699893
Change-Id: I46bc3ff9c0d8d08e8f3aaa15076eb606737355af
2020-11-25 12:14:16 -05:00
Julien Desprez
67e5ec6202 Remove unit tests jar from suites
Remove unit tests jar from official suite packaging
they will be run & tested externally as real unit tests.

Include the compatiblity-tradefed.jar element as it will
be needed.

Test: make cts; run cts-unit-tests
Bug: 173811050
Change-Id: Ie808c7422e35c48c9392f7179806745ef392de64
2020-11-24 13:20:04 -08:00
Kousik Kumar
5985b89536 Merge "Use unified cas uploads / downloads" am: e5b0fbd21a
Original change: https://android-review.googlesource.com/c/platform/build/+/1509332

Change-Id: If45e22b739a0ce7830a5dca24ccaa07d4657d44a
2020-11-24 19:24:57 +00:00
Kousik Kumar
e5b0fbd21a Merge "Use unified cas uploads / downloads" 2020-11-24 18:52:13 +00:00
Daniel Norman
21c34f78e8 Runs host_init_verifier on merged target files packages.
This verifies the init rc files in the merged result.

Bug: 163089173
Test: test_common.py
Test: Run merge_target_files.py to merge two target-files packages where
      one has init_rc errors. Observe script failure.
Test: Run merge_target_files.py on two good target-files packages,
      observe no failure.
Change-Id: I86c8e5a2bc07c2c1896ac40afd32bc1d055447ee
2020-11-24 17:26:27 +00:00
Kousik Kumar
aa79007e04 Use unified cas uploads / downloads
This is to deduplciate uploads and downloads when running builds with
RBE. Especially useful for certain Java / R8 / D8 actions that have JAR
files as common inputs.

Change-Id: I0459d4e5c89bd93e5c0c53195fdabccabec08674
2020-11-24 10:56:32 -05:00
Saeid Farivar Asanjan
75dc8d2dab Dump a new CSV with warning messages
Bug: 171068870
Test: manual
Change-Id: Ibb528940daf9a6cd99ece8e5a63d67aacdfc131c
2020-11-24 05:46:33 +00:00
Jingwen Chen
19bddeb6f6 Merge "Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP." am: 5569faae37
Original change: https://android-review.googlesource.com/c/platform/build/+/1507481

Change-Id: Iee112c36d35ad7e4cb2f852e99fce068ec503f5f
2020-11-24 02:25:46 +00:00
Treehugger Robot
00e93eecd3 Merge "Try to find host tools in the same directory as the caller" am: 84e9bf1a94
Original change: https://android-review.googlesource.com/c/platform/build/+/1505833

Change-Id: I8c515ade2322a6fa54a807ca7da92ee88b6d0984
2020-11-24 02:25:26 +00:00
Treehugger Robot
e4b1c1c64e Merge changes from topic "vab_makefile_move" am: 3e2f8dae78
Original change: https://android-review.googlesource.com/c/platform/build/+/1506504

Change-Id: Ia6630c729c9e51abe47659d9f6769e950c58ea1b
2020-11-24 02:24:47 +00:00
Jingwen Chen
5569faae37 Merge "Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP." 2020-11-24 02:09:21 +00:00
Treehugger Robot
84e9bf1a94 Merge "Try to find host tools in the same directory as the caller" 2020-11-24 02:05:39 +00:00
Treehugger Robot
3e2f8dae78 Merge changes from topic "vab_makefile_move"
* changes:
  Add symlinks to legacy Virtual A/B makefiles.
  Move virtual_ab makefiles to its own dir.
2020-11-24 01:55:21 +00:00
Treehugger Robot
e498803ad5 Merge "build: make fs_config_generator.py python2 explicitly" am: bda655cead
Original change: https://android-review.googlesource.com/c/platform/build/+/1478497

Change-Id: Ib0439a95fa0130c108f3622442beac8dad30ec24
2020-11-23 23:43:03 +00:00
Yifan Hong
6b7cc73ec5 Add Virtual A/B with vendor ramdisk product.
If vendor_ramdisk exists, it is preferred to use launch_with_vendor_ramdisk.mk
because it moves e2fsck to vendor_ramdisk, making ramdisk smaller.

Devices that uses VABC is assumed to have a vendor ramdisk, so inherit
from this new makefile.

Test: pass
Change-Id: If6adad9985ca4750225fd4263edb42de1ddaf486
2020-11-23 15:17:01 -08:00
Yifan Hong
942987d116 Add symlinks to legacy Virtual A/B makefiles.
For Virtual A/B makefiles that is created before S, add
symlinks so that existing devices don't break.

Test: pass
Change-Id: Ie04c4a8a2375edc673a8a7a2adcd162b21178f68
2020-11-23 15:17:01 -08:00
Yifan Hong
018c698280 Move virtual_ab makefiles to its own dir.
Also add a readme file.

Test: none

Change-Id: Ia1e02d8fb0c6df13271f208b3ca1dc1f250b085b
2020-11-23 15:17:01 -08:00
Treehugger Robot
bda655cead Merge "build: make fs_config_generator.py python2 explicitly" 2020-11-23 23:08:22 +00:00
David Anderson
f32cb7f738 Merge "Move snapuserd into the vendor ramdisk." am: 01585c5ce6
Original change: https://android-review.googlesource.com/c/platform/build/+/1501055

Change-Id: Id1b6b561cd174fb8dc037e7290e4fc3ccee4e54e
2020-11-23 21:38:07 +00:00
David Anderson
01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +00:00
Kelvin Zhang
c2fbbbe61f Merge "Add --disable_verity_computation option to ota script" am: 788055c00b
Original change: https://android-review.googlesource.com/c/platform/build/+/1506878

Change-Id: I44c3663dab538a2a5a0e48d448fd57862ddf03ff
2020-11-23 20:20:09 +00:00
Treehugger Robot
a0ceb3c124 Merge "Add installed-files-vendor-ramdisk.txt" am: 1393da036e
Original change: https://android-review.googlesource.com/c/platform/build/+/1507726

Change-Id: Iec5ec53fc94bc53a3ed2d5d475cffa440accaff7
2020-11-23 20:19:49 +00:00
Kelvin Zhang
788055c00b Merge "Add --disable_verity_computation option to ota script" 2020-11-23 19:43:24 +00:00
Treehugger Robot
1393da036e Merge "Add installed-files-vendor-ramdisk.txt" 2020-11-23 19:35:00 +00:00
Kelvin Zhang
caf7bbc39e Add --disable_verity_computation option to ota script
Test: treehugger, generate an OTA with --disable_verity_computation, serve it to
VABC device. Make sure it works

Change-Id: I0a5f3c018727cb3eed3edd004d60d09d13e34039
2020-11-23 13:24:34 -05:00
Jingwen Chen
341928ecc5 Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP.
These variables appear to be unused since Nougat, when Soong was
invoked through Make. This is no longer the case, since soong_build is
now invoked through soong_ui.

https://cs.android.com/android/platform/superproject/+/android-7.1.2_r36:build/core/soong.mk

Test: TH presubmit
Change-Id: I1cfe63144d559fa0da0e54474ed1e36fb3fa0555
2020-11-23 02:06:57 -05:00
Petri Gynther
6ff5201ce9 Add installed-files-vendor-ramdisk.txt
Add installed-files-vendor-ramdisk.txt build artifact, so that it is
easy to see what files landed on the vendor ramdisk.

Test: clean build, inspect installed-files-vendor-ramdisk.txt
Change-Id: Ie84d06dc968ad972ab2bfa79db4d1839ba09e09f
2020-11-20 16:59:57 -08:00
Daniel Norman
36a743c33d Merge "Adds a new build task to run host_init_verifier on partition dirs." am: 97332c9685
Original change: https://android-review.googlesource.com/c/platform/build/+/1495141

Change-Id: I2d00971acd70f722dad55fbf572865fddcbc8e8d
2020-11-20 19:29:04 +00:00
Daniel Norman
97332c9685 Merge "Adds a new build task to run host_init_verifier on partition dirs." 2020-11-20 18:57:17 +00:00
Treehugger Robot
b89394908f Merge "Turns on building vbmeta.img when merging if avb_enable=true." am: adcf94d5b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1506497

Change-Id: I54555f9efc50f335b3af3d1d55243ca86ac34627
2020-11-20 06:22:15 +00:00
Treehugger Robot
adcf94d5b7 Merge "Turns on building vbmeta.img when merging if avb_enable=true." 2020-11-20 06:18:34 +00:00
Treehugger Robot
6043d1f373 Merge "Mark PRODUCT_xxx variables as single item instead of list" am: ca3faad9f2
Original change: https://android-review.googlesource.com/c/platform/build/+/1496640

Change-Id: Iba5603e5ee642f16553aef680192af23c4767b74
2020-11-20 06:15:12 +00:00
Treehugger Robot
ca3faad9f2 Merge "Mark PRODUCT_xxx variables as single item instead of list" 2020-11-20 06:00:36 +00:00
Bo Hu
a084e1bf83 Merge "emulator: enable cfi for emulator's wifi driver" am: 1816caecf1
Original change: https://android-review.googlesource.com/c/platform/build/+/1506496

Change-Id: Ieb2494407b4f6d1ccc2cf8cf2ba33167d90f6ac9
2020-11-20 02:37:48 +00:00
Bo Hu
1816caecf1 Merge "emulator: enable cfi for emulator's wifi driver" 2020-11-20 02:17:44 +00:00
Jiyong Park
c8c94ac38e Try to find host tools in the same directory as the caller
common.py is used by many python-based host tools. When a host tool
invokes another host tool, it's usually done with the name of the tool,
not the absolute path of the tool. For example, ["cmd", "arg"] instead
of ["out/soong/host/linux-x86/bin/cmd", "arg"].

Previously, the caller of the tool has to teach all the locations of the
sub-tools that the tool will internally use. But this isn't ideal;

1) It's against the abstraction. The existence of the sub tools and their
names are implementation detail of the containing tool. It's also
subject to change.

2) This isn't scalable. Sometimes a host tool invokes a large number of
host tools. Furthermore, the sub tools might invoke other sub-sub tools.
Then the location of the sub-sub-tools had to be known to the top-level
tool.

The idea here is to make use of the fact that

a) dependencies to the sub (and sub-sub) tools are already described in
the Android.bp and

b) the dependencies are guaranteed to be up-to-date and installed to the
host tool directory (out/soong/host/linux-x86/bin) by Soong.

Then by the time a host tool is invoked, all of its sub tools should
be found in the host tool directory. So, when "cmd" is about to be
invoked, common.py first tries to find it from the user-given paths. If
not found there, it falls back to search the directory where the current
tool is located at. Then finally falls back to the original name "cmd"
and expects it to be found under PATH.

Bug: 172414391
Test: m
Change-Id: Id7b44f9021be3bbf0631ddafe382ea3990f7ea74
2020-11-20 10:40:54 +09:00
android-build-team Robot
7c553a1c74 Version bump to RQ1A.210105.002 [core/build_id.mk]
Change-Id: I0e3a13c366d2af5e823fd0cc2ec8cc6170a3bb29
2020-11-20 01:21:54 +00:00
Julien Desprez
df41afd42a Merge "Add a template for java host unit tests" am: 0137f2d940
Original change: https://android-review.googlesource.com/c/platform/build/+/1505112

Change-Id: I14c33ff657d384cd36a3649f0f395579b1207b93
2020-11-20 01:20:28 +00:00
Treehugger Robot
d6b56ebb57 Merge "Use 'inherit-product/inherit-product-if-exists to include config files" am: 3ccf730cdc
Original change: https://android-review.googlesource.com/c/platform/build/+/1493738

Change-Id: I05ee2dc8b5a0d285f80a9c7729c23f8bdee2c260
2020-11-20 01:12:10 +00:00
Julien Desprez
0137f2d940 Merge "Add a template for java host unit tests" 2020-11-20 00:07:41 +00:00
Treehugger Robot
3ccf730cdc Merge "Use 'inherit-product/inherit-product-if-exists to include config files" 2020-11-19 23:54:27 +00:00
Daniel Norman
38888d390f Turns on building vbmeta.img when merging if avb_enable=true.
Needed after commit 8218225794
which skips regenerating vbmeta.img if avb_building_vbmeta_image!=true.
Partial builds that disable vbmeta generation do not set this field.

Bug: 169892879
Test: Run merge_target_files.py on builds that have avb_enable=true but
      PRODUCT_BUILD_VBMETA_IMAGE=false. Observe vbmeta.img generation.
Change-Id: Id498dbd28c909e19cd35178b95a0b5dc22a1ac70
2020-11-19 14:51:15 -08:00
bohu
79106cd3ab emulator: enable cfi for emulator's wifi driver
Since the wpa_supplicant_8 has enabled cfi, the
static lib that it uses should enable cfi, otherwise
there will be runtime crashes.

BUG: 169343095
Test:
lunch sdk_phone_arm64-userdebug
m -j
run the image on the aarch64-linux host
hostapd_nohidl and wpa_supplicant should
not crash with cfi failures.

Change-Id: I00e3840032530ee62aac69cab0b54755f83291f9
2020-11-19 12:50:47 -08:00
Julien Desprez
0bb3fffd1a Add a template for java host unit tests
This will execute the host unit tests in isolation.

Test: make aoa-helper-test
Bug: 172961860
Change-Id: Icbbf7214d877bd2e65ac1b97bc299f7af7acdcfe
2020-11-19 09:42:41 -08:00
Inseob Kim
2e88158571 Revert^2 "Always turn on compatible property"
This reverts commit facfb54ee4.

Reason for revert: Fixed broken targets

Change-Id: Ia713b08cf15fd356494984964a1e61eaa9991266
2020-11-19 09:48:49 +00:00
Treehugger Robot
685f2038b4 Merge "Clear LOCAL_IS_UNIT_TEST" am: ad33b891f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1504096

Change-Id: I07f6f13faaeaba444d2f781e3102360905ededc6
2020-11-19 07:44:42 +00:00