Commit Graph

25289 Commits

Author SHA1 Message Date
Jingwen Chen 5569faae37 Merge "Remove SOONG, SOONG_BUILD_NINJA, SOONG_IN_MAKE and SOONG_BOOTSTRAP." 2020-11-24 02:09:21 +00: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 ca3faad9f2 Merge "Mark PRODUCT_xxx variables as single item instead of list" 2020-11-20 06:00:36 +00: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
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
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
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
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
Treehugger Robot d320cbc6d0 Merge "Dump BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST into misc_info.txt" 2020-11-16 17:43:57 +00:00
Ulyana Trafimovich fa611b8dae Merge "Rework class loader context implementation." 2020-11-16 14:50:11 +00:00
Treehugger Robot fc65231af1 Merge "Support PRODUCT_BUILD_VBMETA_IMAGE for target files" 2020-11-16 13:59:41 +00:00
Treehugger Robot d46afc2714 Merge "Fix the order of loading OEM properties" 2020-11-16 09:25:18 +00:00
Yifan Hong cc6c202caa Recovery resource must be install to either boot or vendor_boot
... but not both.

Test: builds
Change-Id: I4bebb09632f49fddef25eadc2cad89f41f38178b
2020-11-13 19:12:19 -08:00
Yifan Hong b95d02eac9 Pass kernel release file to check_vintf.
check_vintf now accepts a file that contains the full kernel
release string as the first half of --kernel. Use it.

With this patch, BOARD_KERNEL_VERSION can be a full kernel release
string like 5.4.42-something, or 5.4.42-android12-0-something.

The content of target_files/META/kernel_version.txt also contains the
full kernel release, not just the kernel version.

Bug: 161317193
Test: m check-vintf-all
Change-Id: I3b52639f557532077894d9356c745c16b41dd91c
2020-11-13 18:45:03 -08:00
Yifan Hong 72e78f21b2 Pass kernel version file to check_vintf.
check_vintf now accept a path to a file that contains the kernel
version string. Use it.

Test: m check-vintf-all and manual inspect
Bug: 161317193
Change-Id: I4812c93f352686d73c5832d59e43a297d93e67a2
2020-11-13 18:45:03 -08:00
Jose Galmes 836b600594 Support for recovery snapshot.
Bug: 171231437
Test: source build/envsetup.sh
Test: ALLOW_MISSING_DEPENDENCIES=true m -j nothing
Change-Id: I0277a3a7225ebb87246c0117fdd51ebbf41adcc6
2020-11-13 15:04:26 -08:00
Bowgo Tsai 8218225794 Support PRODUCT_BUILD_VBMETA_IMAGE for target files
Currently we support skip building vbmeta.img when
PRODUCT_BUILD_VBMETA_IMAGE is set to false, which is used
when generating a system-only or vendor-only build artifacts.

However, when using `make dist` to build target files,
vbmeta.img is still generated. This change fixes this by
passing the related info to misc_info.txt for the release
tool to skip building vbmeta.img when necessary.

To make this happen, a device config should:
 1. Set PRODUCT_BUILD_VBMETA_IMAGE := false
 2. Remove 'vbmeta' from AB_OTA_PARTITIONS:
     AB_OTA_PARTITIONS += \
	 boot \
	 system \
    -    vbmeta \
	 dtbo \
	 product \
	 system_ext \
         vbmeta_system

Bug: 161659370
Test: `make dist` and checks the target file does not include vbmeta.img
Change-Id: Iddca9fe0b171a50a80e5a88aa462e118f18a7e6f
2020-11-13 11:28:17 +08:00
Yifan Hong f07ceb45b2 Merge "aosp_arm64 Copy boot image from $OUT to target files" 2020-11-12 23:50:06 +00:00
Yifan Hong bc685f920c Revert "Mount generic ramdisk as readwrite."
This reverts commit 78b55b2244.

Reason for revert: Replaced by Ib99aca13d4d:
ANDROID: GKI: build in a kernel command line of "rw"

Prebuilt is checked in at Ie34b5b017:
Update kernel to builds 6964541

Fixes: 171512004
Test: TH

Change-Id: I2aec88cc22483a6b3a671fc664d465624a14e5b0
2020-11-12 20:06:54 +00:00
Sasha Smundak 0301d64545 Mark PRODUCT_xxx variables as single item instead of list
Evidenced by soong_config.mk settings and assignements across code base.

Test: treehugger
Bug: 116769560
Change-Id: I7dc27049a32df7b39680d93bddb23e6e6f1e84ca
2020-11-12 10:19:02 -08:00
Alexander Mishkovets 5a6bc22b52 Fix the order of loading OEM properties
Move the OEM property imports so that they take higher precedence over
product and can still be overridden by factory properties.

Bug: 171304788
Test: manual
Change-Id: I0c0be446d5e9af77acfcdeb5145b5776c8d5820f
2020-11-12 13:13:15 +00:00
Kelvin Zhang 5a65f69ae6 Dump BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST into misc_info.txt
Cuttlefish doesn't support updating the vendor partition. So we change
ota_from_target_files to only generate updates for partitions in
BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST. This CL puts the prop in
misc_info.txt, which will be read by ota scrips

Bug: 171999375
Test: mm -j
Change-Id: I4d9c97c717cb73806f95684b3bc81ef285ccbb8b
2020-11-11 14:23:00 -05:00
Yo Chiang 544b5568db Merge "Fix missing required dependency caused by circular dependency" 2020-11-11 03:43:56 +00:00
Yifan Hong 49968aa137 aosp_arm64 Copy boot image from $OUT to target files
If BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES is defined,
in target files, instead of rebuilding the boot image, copy the boot
image already built in $OUT to target files package directly so that
they are the same package.

Define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES for aosp_arm64.

The GKI APEX is built using the boot image in $OUT. If the boot image in
$OUT is different from the boot image in target files, aka the generic
boot image we release, the GKI APEX we built is invalid.

If another device needs to copy $OUT/boot.img to target files, it can
define BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES.

Fixes: 172682114
Test: lunch aosp_arm64 &&
Change-Id: I10fc7a5aa36e976dbeaf25434239687455bba061
2020-11-10 12:55:40 -08:00
Yifan Hong 0674a6e04d Extract boot image from prebuilt apex
Test: m bootimage && file $OUT/boot.img
Bug: 169361394
Change-Id: Id88fd452be8bea82805bde81e407cf6b991120d0
2020-11-09 18:45:42 -08:00
Cole Faust a6fe413946 Merge "Make dump-many-vars work for large variables" 2020-11-09 19:20:24 +00:00
Treehugger Robot 6ca8eef673 Merge "Create a new test zip for hostside unittest" 2020-11-07 04:53:10 +00:00
Cole Faust 2ce1fd907b Make dump-many-vars work for large variables
When printing a large variable like PRODUCT_PACKAGES,
dump-many-vars could fail because the command line is
too long. This is seen as a E2BIG error on the execve
in kati.

To solve this, split the printing up by word in the
variable.

Change-Id: I49db726d7a4769a2f02028194d79934ed5655adf
Fixes: 172287533
Test: lunch bonito-userdebug; get_build_var PRODUCT_PACKAGES
2020-11-07 01:38:20 +00:00
Dan Shi 705d652767 Create a new test zip for hostside unittest
Bug: 172006742
Test: m
Change-Id: Idb82b508d3c49d19f1a76de4311bc0616e1ffa49
2020-11-06 23:00:11 +00:00
Nikita Ioffe bcfaaf9eb2 Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" 2020-11-05 14:02:33 +00:00
Bill Yi 02ffec116f Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE
Merged-In: I2ac90f493820187f3b694a4113faeb5dbcaa9299
Change-Id: Ie492eadd3091d1ed077eb86d6ebfc318b5db2284
2020-11-04 14:04:04 -08:00
Treehugger Robot 50c0f97fe7 Merge "Finds APK shared UID violations when merging target files." 2020-11-04 21:44:40 +00:00
Artur Satayev a97b43e4bd Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."
67e8be4b9c

Test: presubmit
Change-Id: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
Merged-In: I5695dd1003386191dbbe0ea511ef5b615d0d5e4e
(cherry picked from commit 0efeca6a25)
2020-11-03 17:49:30 +00:00
Ulya Trafimovich 1bca532106 Rework class loader context implementation.
In Soong, the old flat representation is changed to a map of trees
(keyed on SDK versions). In Make, the new representation is not as
advanced as in Soong -- it is a map of flat lists rather than trees.
It works for now, because there is only one app that has a non-& class
loader context, and it is simple enough to use flat lists.

Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Bug: 168686456
Change-Id: If1080295a2fafa6772383ee9fbffd7c458462c18
2020-11-03 11:23:42 +00:00