Commit Graph

64224 Commits

Author SHA1 Message Date
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 e5b0fbd21a Merge "Use unified cas uploads / downloads" 2020-11-24 18:52:13 +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
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
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 01585c5ce6 Merge "Move snapuserd into the vendor ramdisk." 2020-11-23 21:18:07 +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 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 adcf94d5b7 Merge "Turns on building vbmeta.img when merging if avb_enable=true." 2020-11-20 06:18:34 +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 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 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
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 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 7a3a2e97ad Merge "Skip the platform availability check for unbundled builds." 2020-11-18 16:24:39 +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 6bf04825b1 Merge "Always turn on compatible property" 2020-11-18 07:23:39 +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 53ccfc38aa Merge "Support for recovery snapshot." 2020-11-17 20:51:54 +00:00
Treehugger Robot fa91bf2fad Merge "Make related stuff for Keymint V1." 2020-11-17 16:13:50 +00:00
Ivan Lozano 82a58294cc Merge "Rust: Collect gnco files with CLANG_COVERAGE too." 2020-11-17 13:06:14 +00:00
Inseob Kim 9994e96c7d Always turn on compatible property
It's mandatory for devices launching with Android P or later.
Some makefiles still depend on PRODUCT_COMPATIBLE_PROPERTY, so rather
than aggressively removing all codes, this forces
PRODUCT_COMPATIBLE_PROPERTY to be true.

Bug: 170082975
Test: m
Change-Id: I49dab8d573c21781e6295a8581a5ad2944e165d7
2020-11-17 10:00:40 +00:00
Treehugger Robot de65fa1959 Merge "Recovery resource must be install to either boot or vendor_boot" 2020-11-17 05:28:13 +00:00
Palmer Dabbelt 750061ddf8 Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" 2020-11-17 03:45:50 +00:00
Martin Stjernholm 8878beb615 Skip the platform availability check for unbundled builds.
Necessary to be able to use the standard Mainline module targets
aosp_${ARCH} on unbundled branches.

Also clean up a superfluous ")" that got added to the
not_installable_file target.

Test: m TARGET_PRODUCT=aosp_arm64 com.android.art
Bug: 172480615
Change-Id: Id85d0ffc8fe90c3e861666e6e2db963e0d9468a2
2020-11-17 02:46:05 +00:00
Treehugger Robot a39ec91fbe Merge "Revert "Mount generic ramdisk as readwrite."" 2020-11-17 01:11:36 +00:00
Dan Shi 41f6291a9f Add unit tests to host-unit-tests suite
Bug: 172006742
Test: m
Change-Id: Id58f5a24df2fe61229ce2eae2d655f7aa31b6aba
2020-11-16 16:55:42 -08:00
Treehugger Robot 68f59362f4 Merge "aosp_arm64: clarify GKI in readme." 2020-11-17 00:46:41 +00:00
Yifan Hong 187e975927 Merge changes from topic "gki_vintf_level"
* changes:
  Pass kernel release file to check_vintf.
  Pass kernel version file to check_vintf.
2020-11-16 23:48:47 +00:00
Ivan Lozano d5d15c8673 Rust: Collect gnco files with CLANG_COVERAGE too.
Until Rust supports LLVM coverage, Soong treats both NATIVE_COVERAGE and
CLANG_COVERAGE as producing GCOV coverage files. On the make-side, we
should be collecting the gcno files into a zip file when CLANG_COVERAGE
is defined too.

Bug: 170983066
Test: Coverage build with CLANG_COVERAGE produces zip file.
Change-Id: If6f86280f0d823e86884b64729530cc3548103a1
2020-11-16 15:32:19 -05:00
Yifan Hong d440184471 aosp_arm64: clarify GKI in readme.
Test: none
Change-Id: Id24912a67c8700f3c68dfa924ab7b85246c7fcb0
2020-11-16 11:40:58 -08:00
Treehugger Robot 59dd38cdb0 Merge "Include complete boot image on builds containing gki apex" 2020-11-16 18:04:46 +00:00