Commit Graph

66224 Commits

Author SHA1 Message Date
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
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
Treehugger Robot ad33b891f8 Merge "Clear LOCAL_IS_UNIT_TEST" 2020-11-19 07:16:29 +00:00
David Anderson 8820eaa5e5 Move snapuserd into the vendor ramdisk.
For devices that are GKI capable, including virtual_ab_ota_compression
will now include snapuserd in the vendor ramdisk.

For devices that are not GKI-capable (eg do not have vendor_boot),
virtual_ab_ota_compression_retrofit.mk must be included in addition to
virtual_ab_ota_compression.mk. This structure is to avoid needing a
large combination of different Makefiles.

Bug: 173463595
Test: manual test
Change-Id: Idc740d3523c2d166dd578cee41ea07d7eaf8edfa
2020-11-18 22:12:34 -08:00
Dan Shi 15d3f8f697 Clear LOCAL_IS_UNIT_TEST
Bug: 172006742
Test: none
Change-Id: I15c4f5b97bea9e3562766a3fbd3a8058ce042bd4
2020-11-18 15:37:01 -08:00
Yifeng Zeng ef9dfaef76 Merge "Copy generated $(PRODUCT_OUT)/module-info.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." am: 9b9f56d31e
Original change: https://android-review.googlesource.com/c/platform/build/+/1502354

Change-Id: I40f2c0022393829758ec0e40691d50e81b3c5c5b
2020-11-18 21:52:06 +00:00
Yifeng Zeng 9b9f56d31e Merge "Copy generated $(PRODUCT_OUT)/module-info.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set." 2020-11-18 20:20:40 +00:00
Daniel Norman c5604a02f7 Adds a new build task to run host_init_verifier on partition dirs.
Also includes passwd_system_ext in copy-init-script-file-checked,
seemingly left out as an oversight.

Bug: 163089173
Test: Treehugger build targets
Change-Id: I3b972e4677a6adad2c515f5762e0062803453d18
2020-11-18 11:36:19 -08:00
Martin Stjernholm c1ad3e1d86 Merge "Skip the platform availability check for unbundled builds." am: 7a3a2e97ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1501670

Change-Id: I75fdad0fd912b32793d78ca9fdabb3eb9830f0d9
2020-11-18 16:44:54 +00:00
Martin Stjernholm 7a3a2e97ad Merge "Skip the platform availability check for unbundled builds." 2020-11-18 16:24:39 +00:00
Will Osborn 52eced6e9d Merge "Revert "Always turn on compatible property"" am: 4193982580
Original change: https://android-review.googlesource.com/c/platform/build/+/1502413

Change-Id: Icb6cdac879d28f7593716ae5935588e65be17713
2020-11-18 11:30:35 +00:00
Will Osborn 4193982580 Merge "Revert "Always turn on compatible property"" 2020-11-18 11:13:58 +00:00
Inseob Kim facfb54ee4 Revert "Always turn on compatible property"
This reverts commit 9994e96c7d.

Reason for revert: broken targets on the internal branch

Change-Id: Ic440fb1ca6ae5774a1d51e8fe1f3724426511841
2020-11-18 11:04:17 +00:00
Treehugger Robot 08b224553d Merge "Always turn on compatible property" am: 6bf04825b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1448475

Change-Id: I5a0f6f16b04a32001724fbf179f1858b0fe8ef0e
2020-11-18 07:50:26 +00:00
Treehugger Robot 6bf04825b1 Merge "Always turn on compatible property" 2020-11-18 07:23:39 +00:00
Dan Shi 2581c744d3 Merge "Add unit tests to host-unit-tests suite" am: 6048b679f3
Original change: https://android-review.googlesource.com/c/platform/build/+/1498233

Change-Id: Ifd6d43ee07fc09127baa8249cdd95ad9deaa05ae
2020-11-18 04:51:06 +00:00
Dan Shi 6048b679f3 Merge "Add unit tests to host-unit-tests suite" 2020-11-18 04:40:37 +00:00
Yifeng Zeng 154ff7ebc8 Copy generated $(PRODUCT_OUT)/module-info.json file to dist when SOONG_COLLECT_JAVA_DEPS flag is set.
Test: build/soong/soong_ui.bash --make-mode SKIP_ABI_CHECKS=true SOONG_COLLECT_JAVA_DEPS=true TARGET_PRODUCT=aosp_cf_x86_phone TARGET_BUILD_VARIANT=userdebug droid dist DIST_DIR=/usr/local/google/home/yifengzeng/temp EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="*" NATIVE_COVERAGE_EXCLUDE_PATHS="art bionic/libc device"

Bug: 168755196
Change-Id: I2b54d7cd1aaef1068ed5dfe35bfc4a8525b2e968
2020-11-18 03:34:01 +00:00
Jose "Pepe" Galmes 0854c6592d Merge "Support for recovery snapshot." am: 53ccfc38aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1489078

Change-Id: I49c6049b0d3c2a36a41bc47df61b40ef20883bf6
2020-11-17 21:23:34 +00:00
Jose "Pepe" Galmes 53ccfc38aa Merge "Support for recovery snapshot." 2020-11-17 20:51:54 +00:00
Treehugger Robot d051b1381f Merge "Make related stuff for Keymint V1." am: fa91bf2fad
Original change: https://android-review.googlesource.com/c/platform/build/+/1390756

Change-Id: I384f401cc3c395a5069d27c940b5b1da2d3def6a
2020-11-17 16:55:17 +00:00
Treehugger Robot fa91bf2fad Merge "Make related stuff for Keymint V1." 2020-11-17 16:13:50 +00:00
Ivan Lozano e1f8a9a29a Merge "Rust: Collect gnco files with CLANG_COVERAGE too." am: 82a58294cc
Original change: https://android-review.googlesource.com/c/platform/build/+/1492557

Change-Id: I017512260cb4ab232b3e742d0085c37e7fe13360
2020-11-17 13:28:06 +00:00
Ivan Lozano 82a58294cc Merge "Rust: Collect gnco files with CLANG_COVERAGE too." 2020-11-17 13:06:14 +00:00