Commit Graph

26184 Commits

Author SHA1 Message Date
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
d9d17e080c Merge "Rework class loader context implementation." am: fa611b8dae am: 6a8dea8894
Original change: https://android-review.googlesource.com/c/platform/build/+/1450955

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

Change-Id: I3e5d7497cf83d998a951465ab1496ad4ab159905
2020-11-16 14:47:16 +00:00
Treehugger Robot
fc65231af1 Merge "Support PRODUCT_BUILD_VBMETA_IMAGE for target files" 2020-11-16 13:59:41 +00:00
Treehugger Robot
6d75a7cce8 Merge "Fix the order of loading OEM properties" am: d46afc2714 am: 9594457103
Original change: https://android-review.googlesource.com/c/platform/build/+/1495941

Change-Id: I98b0a9ee195d154b55bf46a78834e43f9ee73550
2020-11-16 10:06:30 +00:00
Treehugger Robot
d46afc2714 Merge "Fix the order of loading OEM properties" 2020-11-16 09:25:18 +00:00
android-build-team Robot
d7081bc18a Make change and version bump to RQ2A.201116.001
Change-Id: I6e0f6987f2e52dc2056d519bbb4345a30f9a307f
2020-11-15 22:17:30 +00:00
android-build-team Robot
fe5481ac2a Make change and version bump to RQ2A.201115.001
Change-Id: I1ed1839c11b92333dffc7f8f4b96f01aa510b30b
2020-11-14 22:16:22 +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
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
android-build-team Robot
36caae16a5 Make change and version bump to RQ2A.201114.001
Change-Id: I7625bbaacab787d768b93a31be8d639df5f1b5f6
2020-11-14 00:17:00 +00: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
254a91de7e Merge "aosp_arm64 Copy boot image from $OUT to target files" am: f07ceb45b2 am: 1564782378
Original change: https://android-review.googlesource.com/c/platform/build/+/1493256

Change-Id: Ie56a170cf6f7a7aa3d12250beb1bae9f65b7f3a6
2020-11-13 00:49:22 +00:00
android-build-team Robot
c14ee4a4b3 Make change and version bump to RQ2A.201113.001
Change-Id: I2130c252124e339c13273cfb5d0ed3de927dac7b
2020-11-13 00:23:17 +00: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
android-build-team Robot
370905e5a3 Make change and version bump to RQ2A.201112.001
Change-Id: Ia652d06153029f8c37c454ef28da586dfa917c74
2020-11-12 00:20:40 +00:00
Liz Kammer
02b6cdf5e3 Update mts task to make mts-${MODULE} test suites
In addition to a single mts test suite, we want to have slim, per-module
mts test suites. This introduces the infrastructure to build a test
suite for each module added to mts_modules.

Bug: 170318013
Test: m mts
Test: m mts-tzdata
Change-Id: Ib93ea14e6fa99e362785681cd7660a1ca37e0fe3
2020-11-11 14:10:45 -08:00
android-build-team Robot
642ed5e4ff Version bump to RQ1A.201205.011 [core/build_id.mk]
Change-Id: If88829e911f694205051cf617d8cc707e59eae55
2020-11-11 19:31:54 +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
5829241c64 Merge "Fix missing required dependency caused by circular dependency" am: 544b5568db am: c81251e516
Original change: https://android-review.googlesource.com/c/platform/build/+/1321320

Change-Id: Ie2a022ebb72d401bc0b755b6b5bf841e40c8a9ba
2020-11-11 04:36:38 +00:00
Yo Chiang
544b5568db Merge "Fix missing required dependency caused by circular dependency" 2020-11-11 03:43:56 +00:00
android-build-team Robot
773b2db4f3 Make change and version bump to RQ2A.201111.001
Change-Id: I433823eb4cf0f105879af5c135be69b44179b109
2020-11-11 00:16:54 +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
dda27e3525 Merge "Extract boot image from prebuilt apex" am: 4cecc43796 am: 89ff2885c5
Original change: https://android-review.googlesource.com/c/platform/build/+/1471253

Change-Id: I1acd8a94834f5079b39b4a3af3b6526b9cc3ffff
2020-11-10 19:14:44 +00: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
android-build-team Robot
69bbdae7a5 Make change and version bump to RQ2A.201110.001
Change-Id: I0f5a0c67b5a1459c9442e5f5fea31149bfd8ed43
2020-11-10 00:16:47 +00:00
Cole Faust
ff562a0f57 Merge "Make dump-many-vars work for large variables" am: a6fe413946 am: aed3404c00
Original change: https://android-review.googlesource.com/c/platform/build/+/1486402

Change-Id: Iaf2fff063f48e8538edb86cec16b97c530816d86
2020-11-09 19:41:55 +00:00
Cole Faust
a6fe413946 Merge "Make dump-many-vars work for large variables" 2020-11-09 19:20:24 +00:00
android-build-team Robot
ea5aa0f470 Make change and version bump to RQ2A.201109.001
Change-Id: I4951067ae7e1f0ad1e363dd2d7b73d8058b41813
2020-11-08 22:16:32 +00:00
android-build-team Robot
75e0ecada9 Make change and version bump to RQ2A.201108.001
Change-Id: Idd1a547de669358c848d663f46e49859334d45f8
2020-11-07 22:16:49 +00:00
Treehugger Robot
d921fece88 Merge "Create a new test zip for hostside unittest" am: 6ca8eef673 am: 3534f7ea31
Original change: https://android-review.googlesource.com/c/platform/build/+/1484536

Change-Id: I4646ad089ff6d06ee5d4aade03d048ced5905ff6
2020-11-07 06:02:02 +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
android-build-team Robot
89a022dde6 Make change and version bump to RQ2A.201107.001
Change-Id: I7e3588e86b658ea6bc666b328cc1feb437f6f530
2020-11-07 00:16:23 +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
JaeMan Park
afdd39fd10 Add java sdk library enforcement flag
Add java sdk library enforcement for inter-partition library
dependency, for ensuring backward-compatible libraries for
inter-partition dependencies.

Test: m nothing
Bug: 168180538
Change-Id: I6bfac54c3499b03003a3bc6c2bb62b165b4ce5f9
2020-11-06 01:34:39 +00:00
android-build-team Robot
c3642e38d6 Make change and version bump to RQ2A.201106.001
Change-Id: Ib016c2b199f0782ae5f750ab2dd303d2404ae046
2020-11-06 00:17:01 +00:00
Nikita Ioffe
3a19026490 Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" am: bcfaaf9eb2 am: 058ef86ac3
Original change: https://android-review.googlesource.com/c/platform/build/+/1486317

Change-Id: Ifd9985fe6516eabf302c6743899a812cf25ae67e
2020-11-05 14:26:40 +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
android-build-team Robot
a95305b81f Version bump to RQ1A.201205.010 [core/build_id.mk]
Change-Id: If81905c947ee0cf2ba991830b6559ed553a18d68
2020-11-05 04:08:27 +00:00
android-build-team Robot
2e873aef1b Make change and version bump to RQ2A.201105.001
Change-Id: I356242daeb310a092c19041a75c1100f20413001
2020-11-05 00:19:19 +00:00
Treehugger Robot
760bde5cb8 Merge "Finds APK shared UID violations when merging target files." am: 50c0f97fe7 am: 101dc0e0d7
Original change: https://android-review.googlesource.com/c/platform/build/+/1477396

Change-Id: If0a7a197aafabb6a4b76b7b14eb68da4cca44bcd
2020-11-04 22:10:06 +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
101dc0e0d7 Merge "Finds APK shared UID violations when merging target files." am: 50c0f97fe7
Original change: https://android-review.googlesource.com/c/platform/build/+/1477396

Change-Id: I593b41fadd040a78b69be7031ecad813b4821e73
2020-11-04 21:55:15 +00:00