Commit Graph

66240 Commits

Author SHA1 Message Date
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
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 fbe87f3160 Merge "Recovery resource must be install to either boot or vendor_boot" am: de65fa1959
Original change: https://android-review.googlesource.com/c/platform/build/+/1499186

Change-Id: I72e6bc32f940078de0cbb32f75e0dfd2e78228d3
2020-11-17 05:37:29 +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 793516264d Merge "Add dmuserd to PRODUCT_PACKAGES_DEBUG" am: 750061ddf8
Original change: https://android-review.googlesource.com/c/platform/build/+/1482957

Change-Id: I413775f6c482bdb89177d7549634946a940b74be
2020-11-17 04:00:25 +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 cd604f87b0 Merge "Revert "Mount generic ramdisk as readwrite."" am: a39ec91fbe
Original change: https://android-review.googlesource.com/c/platform/build/+/1490345

Change-Id: I889c6955c9166644e2fad1532bf3cb524301aabd
2020-11-17 01:53:24 +00:00
Treehugger Robot 3cb8c98c30 Merge "aosp_arm64: clarify GKI in readme." am: 68f59362f4
Original change: https://android-review.googlesource.com/c/platform/build/+/1500890

Change-Id: Ib6f644418d2f14a7e23fa818bea29c8f242ce046
2020-11-17 01:48:34 +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 9f8188c1ef Merge changes from topic "gki_vintf_level" am: 187e975927
Original change: https://android-review.googlesource.com/c/platform/build/+/1499185

Change-Id: Ic709f974c23560cfdb518105193074a44336a76f
2020-11-17 00:15:47 +00:00
Yifan Hong 1e21bce346 Pass kernel version file to check_vintf. am: 72e78f21b2
Original change: https://android-review.googlesource.com/c/platform/build/+/1499184

Change-Id: Ic6c2fee383613debc0b624ee9bbcb365feda47b4
2020-11-17 00:15:26 +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 4689fca0a0 Merge "Include complete boot image on builds containing gki apex" am: 59dd38cdb0
Original change: https://android-review.googlesource.com/c/platform/build/+/1486116

Change-Id: Ib96af73ca56ad35e19c36f3b189f53db7489377b
2020-11-16 18:17:21 +00:00
Treehugger Robot 59dd38cdb0 Merge "Include complete boot image on builds containing gki apex" 2020-11-16 18:04:46 +00:00
Treehugger Robot 1b4c7baaf4 Merge "Dump BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST into misc_info.txt" am: d320cbc6d0
Original change: https://android-review.googlesource.com/c/platform/build/+/1486758

Change-Id: Iac37290a950eda952439372b1e9e1c0e111eff5e
2020-11-16 17:57:35 +00:00
Treehugger Robot d320cbc6d0 Merge "Dump BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST into misc_info.txt" 2020-11-16 17:43:57 +00:00
Treehugger Robot a9ca48d96a Merge "OWNERS: include core sepolicy OWNERS" am: 696b0a2667
Original change: https://android-review.googlesource.com/c/platform/build/+/1499364

Change-Id: Ie831b9f55d6a896534cae07579ad2033cc5ad8b5
2020-11-16 16:14:16 +00:00
Treehugger Robot 696b0a2667 Merge "OWNERS: include core sepolicy OWNERS" 2020-11-16 16:03:38 +00:00
Ulyana Trafimovich 6a8dea8894 Merge "Rework class loader context implementation." am: fa611b8dae
Original change: https://android-review.googlesource.com/c/platform/build/+/1450955

Change-Id: Ida23196e7d16830c5cd37ba6386327439371f5cf
2020-11-16 15:08:42 +00:00
Ulyana Trafimovich fa611b8dae Merge "Rework class loader context implementation." 2020-11-16 14:50:11 +00:00
Treehugger Robot d74993c7ca Merge "Support PRODUCT_BUILD_VBMETA_IMAGE for target files" am: fc65231af1
Original change: https://android-review.googlesource.com/c/platform/build/+/1498416

Change-Id: Ibd2f8c3f843c96f0d6cfbd43f19d6e9cf4cc91db
2020-11-16 14:34:11 +00:00
Treehugger Robot fc65231af1 Merge "Support PRODUCT_BUILD_VBMETA_IMAGE for target files" 2020-11-16 13:59:41 +00:00
Jeff Vander Stoep f5dd057095 OWNERS: include core sepolicy OWNERS
Simplify OWNERS by referencing a centralized list.

Test: n/a
Change-Id: Ibbdb8b217e387bdc66069e91d034a933ca9fa2b0
2020-11-16 13:26:38 +01:00
Treehugger Robot 9594457103 Merge "Fix the order of loading OEM properties" am: d46afc2714
Original change: https://android-review.googlesource.com/c/platform/build/+/1495941

Change-Id: I385e59ccd9ccfbc1f5710fb17aa68cf60ccaa5ab
2020-11-16 09:40:03 +00:00
Treehugger Robot d46afc2714 Merge "Fix the order of loading OEM properties" 2020-11-16 09:25:18 +00:00
Kelvin Zhang 8fb571feb5 Merge "Allow downgradeable secondary payload" am: 072efc92e2
Original change: https://android-review.googlesource.com/c/platform/build/+/1494316

Change-Id: Ib9105fa3632202248dea715bc526378fd1961b05
2020-11-14 03:22:15 +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
Kelvin Zhang 072efc92e2 Merge "Allow downgradeable secondary payload" 2020-11-14 03:09:49 +00: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
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