StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,871 Commits 1 Branch 0 Tags
e20042c5f8ff9cf9be913e68c0c9c6d38c97fb9c
Commit Graph

29534 Commits

Author SHA1 Message Date
Treehugger Robot
7de906b12d Merge "core/Makefile: system_dlkm: Copy image for dist" am: 488c598f24 am: e906d8edc0 am: 92fce4ef97 am: f3176ffd3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1958308

Change-Id: Ie378122ca53ed10ce4f74f6f475c8972f4dfad7d
 2022-01-25 12:35:51 +00:00
Narayan Kamath
aac02e4e65 Merge "Update minimum supported targetSdk to 28." am: 3852e68d8b am: 7137d50d36 am: 9726098b55 am: 329167515e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1959079

Change-Id: I4ab8af7cf9a51235c4f9782b3d030434bf1f6b54
 2022-01-25 12:35:21 +00:00
Treehugger Robot
f3176ffd3d Merge "core/Makefile: system_dlkm: Copy image for dist" am: 488c598f24 am: e906d8edc0 am: 92fce4ef97 
Original change: https://android-review.googlesource.com/c/platform/build/+/1958308

Change-Id: Ie853b9e38e13a7d231ac3ddc31f2cac7f8d6f5f7
 2022-01-25 12:22:18 +00:00
Narayan Kamath
329167515e Merge "Update minimum supported targetSdk to 28." am: 3852e68d8b am: 7137d50d36 am: 9726098b55 
Original change: https://android-review.googlesource.com/c/platform/build/+/1959079

Change-Id: I40018d35f3ca5485c75a5ac7eade7adddaf726dc
 2022-01-25 12:21:54 +00:00
Treehugger Robot
92fce4ef97 Merge "core/Makefile: system_dlkm: Copy image for dist" am: 488c598f24 am: e906d8edc0 
Original change: https://android-review.googlesource.com/c/platform/build/+/1958308

Change-Id: I2c97de8838b90c25f5093d85e408278fa0907c2f
 2022-01-25 12:06:43 +00:00
Narayan Kamath
9726098b55 Merge "Update minimum supported targetSdk to 28." am: 3852e68d8b am: 7137d50d36 
Original change: https://android-review.googlesource.com/c/platform/build/+/1959079

Change-Id: If96b429f55f0b095eb91104652fb549e1e353a91
 2022-01-25 12:06:32 +00:00
Treehugger Robot
488c598f24 Merge "core/Makefile: system_dlkm: Copy image for dist" 2022-01-25 11:42:27 +00:00
Narayan Kamath
3852e68d8b Merge "Update minimum supported targetSdk to 28." 2022-01-25 10:33:37 +00:00
Ramji Jiyani
034e777339 core/Makefile: system_dlkm: Copy image for dist 
Add support to copy built system_dlkm to IMAGES;
or prebuilt image to PREBUILD_IMAGES for release
tools to pick up for the dist zip.

Bug: 200082547
Test: Manual builds:
      1. Set BOARD_USES_SYSTEM_DLKM_PARTITION
      2. Set BOARD_PREBUILT_SYSTEM_DLKM_IMAGE to external image
      - Check "m" builds the system_dlkm.img in both cases;
        and drops image at out/target/product/vsoc_x86_64/
      - Check that "m dist" can find the image in
        $(zip_root)/IMAGES and $(zip_root)/PREBUILT_IMAGES
Test: launch_cvd && atest vts_system_dlkm_partition_test
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I77dfcc51746fd97cb205aa9c139a08f5cdf3d9ea
 2022-01-24 21:27:52 +00:00
Devin Moore
3b2805d941 Merge "Fix initbootimage .PHONY target" am: 4724f77bca am: a4bb5a404f am: 046a98f644 am: 327007b66c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: Ie0a63bcd6689f676c1b6f05f7878e475a65eb310
 2022-01-24 16:16:16 +00:00
Devin Moore
327007b66c Merge "Fix initbootimage .PHONY target" am: 4724f77bca am: a4bb5a404f am: 046a98f644 
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: I78bf70d8ee303520bee73d9b0824b7f3c03ce97a
 2022-01-24 16:04:38 +00:00
Devin Moore
046a98f644 Merge "Fix initbootimage .PHONY target" am: 4724f77bca am: a4bb5a404f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: Ia595d09e6a8386b10975e9995e8b27fead00aa95
 2022-01-24 15:49:58 +00:00
Devin Moore
4724f77bca Merge "Fix initbootimage .PHONY target" 2022-01-24 15:17:17 +00:00
Nicolas Geoffray
1ba4c8a02a Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 am: 08fbf0f75a am: 4f78caaa4e am: 934fde3a64 
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I60d55e50eb3ad22a9385cdb893f42eed8115981b
 2022-01-24 15:03:55 +00:00
Narayan Kamath
7918526355 Update minimum supported targetSdk to 28. 
Trailing by 4 major releases, as per schedule.

Test: make
Bug: 215522897
Change-Id: I893fe0ee68cce4b08061628ed641b845d2d79b63
 2022-01-24 14:59:20 +00:00
Nicolas Geoffray
934fde3a64 Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 am: 08fbf0f75a am: 4f78caaa4e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: Ic5028c0c348ecb06a561112434dd49fc63c0f8d4
 2022-01-24 14:51:43 +00:00
Nicolas Geoffray
4f78caaa4e Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 am: 08fbf0f75a 
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2e9363f35a74ab594e7bcc2308cb641ffe93d405
 2022-01-24 14:35:04 +00:00
Nicolas Geoffray
7d0f8dd332 Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" 2022-01-24 13:59:48 +00:00
Treehugger Robot
b5d007b2f8 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 am: 5b6d4a2e13 am: 2de0ca59d6 am: b18796f9e5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Ib1394888b769622fe261cee1f41cde7b553c606c
 2022-01-23 02:02:10 +00:00
Treehugger Robot
b18796f9e5 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 am: 5b6d4a2e13 am: 2de0ca59d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Idf71ec05fdd4dc2d91ba3f81fee24fc7b8633afa
 2022-01-23 01:43:54 +00:00
Treehugger Robot
2de0ca59d6 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 am: 5b6d4a2e13 
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Ibc792f2f6cdc688690d4ea5cca6a963695f038c8
 2022-01-23 01:32:39 +00:00
Ramji Jiyani
107c452265 core/Makefile: system_dlkm: Fix non avb dep typo 
$(MKFSEROFS) -> $(MKEROFS) in target dependency
for INSTALLED_SYSTEM_DLKM_IMAGE_TARGET in case
when AVB is not enabled.

Bug: 200082547
Test: TH
Test: atest vts_system_dlkm_partition_test
Fixes: 1065523a5e ("Add support to build system_dlkm.img")
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I03a4463b1fa01b95e706d623aa8a3888e37488d6
 2022-01-22 20:38:49 +00:00
Ramji Jiyani
4bc5ce9872 Merge "Add support to build system_dlkm.img" am: 1a40ac361e am: f20e06e165 am: 42d87e1cd2 am: 067c1cbbea 
Original change: https://android-review.googlesource.com/c/platform/build/+/1955977

Change-Id: Ia27bb4fc997f2a93be2a3254f44a3811c2f1229b
 2022-01-22 11:13:38 +00:00
Ramji Jiyani
067c1cbbea Merge "Add support to build system_dlkm.img" am: 1a40ac361e am: f20e06e165 am: 42d87e1cd2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1955977

Change-Id: I224fd2e2c7d87a76cadab59bbec4fddd07eb0104
 2022-01-22 10:54:56 +00:00
Ramji Jiyani
42d87e1cd2 Merge "Add support to build system_dlkm.img" am: 1a40ac361e am: f20e06e165 
Original change: https://android-review.googlesource.com/c/platform/build/+/1955977

Change-Id: Ie91e7d75fd7a95914c6a83d7fbedd92e07cf4e4d
 2022-01-22 10:44:06 +00:00
Ramji Jiyani
1a40ac361e Merge "Add support to build system_dlkm.img" 2022-01-22 10:07:18 +00:00
Treehugger Robot
54fe9f336c Merge "Generalize @Keep annotation Proguard rules" am: 7ef84931aa am: d55d83e475 am: cb3f32d7e9 am: 60d01dfe83 
Original change: https://android-review.googlesource.com/c/platform/build/+/1923477

Change-Id: I374ca364ee3150ebead4e85404792241890c1634
 2022-01-22 00:25:17 +00:00
Treehugger Robot
60d01dfe83 Merge "Generalize @Keep annotation Proguard rules" am: 7ef84931aa am: d55d83e475 am: cb3f32d7e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1923477

Change-Id: Ifa5d3f742a2b062bee03e44bf225ec6f104261d3
 2022-01-22 00:24:58 +00:00
Treehugger Robot
cb3f32d7e9 Merge "Generalize @Keep annotation Proguard rules" am: 7ef84931aa am: d55d83e475 
Original change: https://android-review.googlesource.com/c/platform/build/+/1923477

Change-Id: I4d6782eba6124880aaad5b20d17aea2c55614460
 2022-01-22 00:07:29 +00:00
Ramji Jiyani
1065523a5e Add support to build system_dlkm.img 
There are 2 choices to build system_dlkm.img for
the system_dlkm partition for Android T launch
devices and must choose one.

1. Use kernel prebuilt system_dlkm.img
   - BOARD_PREBUILT_SYSTEM_DLKM_IMAGE to point image
2. Build from kernel prebuilt system_dlkm_staging
   - PRODUCT_BUILD_SYSTEM_DLKM_IMAGE

Both requires: BOARD_SYSTEM_DLKM_PARTITION_SIZE and
must be 64MB or higher in size (enforced via vts).

Bug: 200082547
Test: TH
Test: atest vts_system_dlkm_partition_test
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I83435123bd8aa3d04ab8a8b650a95fbab0bc49f2
 2022-01-21 21:39:15 +00:00
Jared Duke
4bd749bf38 Generalize @Keep annotation Proguard rules 
Consolidate the Proguard rules for @Keep annotations for:
  * android.support.annotation.Keep (existing)
  * androidx.annotation.Keep (existing)
  * com.android.internal.annotation.Keep (new)

This ensures consistent semantics for clients using these annotations
across the codebase. Ideally there would be a single annotation, but
the support libraries are not available everywhere. In practice, this
change should be a no-op.

Bug: 210510433
Test: m + validate identical artifact sizes
Change-Id: Iab494e03269e5758d7f860331e971826ecc08cdd
 2022-01-21 19:50:15 +00:00
Rupert Shuttleworth
02fd4b6987 Merge "Fix phony target warning for LOCAL_ROTATION_MIN_SDK_VERSION." 2022-01-21 13:30:00 +00:00
Rupert Shuttleworth
13f6bb4879 Fix phony target warning for LOCAL_ROTATION_MIN_SDK_VERSION. 
Test: m signapk
Test: make GoogleRestorePrebuilt apksigner
Test: Add LOCAL_ROTATION_MIN_SDK_VERSION := 33 to vendor/unbundled_google/packages/GoogleRestorePrebuilt/Android.mk and run both commands above again -- no phony target warnings

Bug: 197787352

Change-Id: If106113b6557ad1ecf24e2778bd38e7cb30e39ca
 2022-01-20 23:17:15 -05:00
Junfeng Wu
b42c464cf6 Remove the duplicate RBE_CXX_COMPARE config. 
The duplication comes from a merge conflict resolution: 0d0d422359:core/rbe.mk;dlc=76ffe4f5ba0c711b118b9df010ffde328866367d

Test: Ran an RBE build locally with RBE_CXX_COMPARE enabled.
Bug: b/214886208

Change-Id: I7104fe3ce0c2861594f42633eb19105ff845ae4d
 2022-01-20 23:48:50 +08:00
Devin Moore
35b69f698d Fix initbootimage .PHONY target 
This was assigning the INSTALLED_INIT_BOOT_IMAGE_TARGET to bootimage
instead of initbootimage.

Test: m
Bug: 203698939
Change-Id: I5fc6e2296dac8cc35c4d46601fea6ab0ee18fd18
 2022-01-20 15:26:47 +00:00
Nicolas Geoffray
4ff406c4a1 Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." 
This reverts commit 50930076a2.

Bug: 214049018

Reason for revert: Not needed after all.

Change-Id: Ifbf3053fd70c5880e58136821a2fb8b783c48e2a
 2022-01-19 16:22:07 +00:00
Pirama Arumuga Nainar
bc66932895 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0 am: 6332808700 am: 76c6975e05 am: dbdd594fae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: I375d4f488e78b9f6b7e9c9954d19bbd5eb69d8a7
 2022-01-19 07:09:47 +00:00
Pirama Arumuga Nainar
dbdd594fae Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0 am: 6332808700 am: 76c6975e05 
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: Ic2454804d74ef2a3862a6b3ced172aefdbd9eccc
 2022-01-19 06:51:32 +00:00
Pirama Arumuga Nainar
76c6975e05 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0 am: 6332808700 
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: I8d711cdaf94e5a88da0e863fde3bab56ab3aeb60
 2022-01-19 06:33:30 +00:00
Pirama Arumuga Nainar
5fe798bea0 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" 2022-01-19 06:03:25 +00:00
Bassem Khalife
cfd95b84f7 Update security string to 2022-03-01 am: 389f21950c am: eb389ab195 am: da539453f8 am: 0c1d6c0f4e am: 87a92018fc am: 6833559fbd am: ac9415f174 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16644783

Change-Id: I8ca46503a4d23d2aa915cce7b19260decbec656d
 2022-01-18 21:17:07 +00:00
Pirama Arumuga Nainar
e6b8497408 Revert "Set a BIONIC_COVERAGE .mk variable" 
This reverts commit b1b4e1e38b.

Bug: http://b/194128476

Coverage metrics dropped for ~10 of the 40 modules.  There are also
regressions in mainline when running tests on older platform builds.

Test: presubmit
Change-Id: Ib34f607292cd64e7cb9fe35c59a4f79b46904ab8
 2022-01-18 13:09:01 -08:00
Nicolas Geoffray
53e651d4dd Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 am: d43a0701d9 am: 22d159fd3c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: Icb8cd7bf0191fb96765da535200570884591c18c
 2022-01-17 13:30:15 +00:00
Nicolas Geoffray
22d159fd3c Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 am: d43a0701d9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: I107975440f1d9d9ae1ec8b57593cb7b7d2fdbeeb
 2022-01-17 13:16:45 +00:00
Nicolas Geoffray
d43a0701d9 Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 
Original change: https://android-review.googlesource.com/c/platform/build/+/1948581

Change-Id: I1a545ff9b11e181c6ba7c0ccb9518aad547cf5f2
 2022-01-17 13:00:53 +00:00
Nicolas Geoffray
00a48b3df7 Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." 2022-01-17 12:23:19 +00:00
Yi-yo Chiang
a7bba893e9 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829 am: c06825ad77 am: 78f5c8b0e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: I67c87eb3f171b1ecc803248a6728e368203e8059
 2022-01-17 06:25:07 +00:00
Yi-yo Chiang
78f5c8b0e1 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829 am: c06825ad77 
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: Ie689812cee0f3476aa2c3df988c70c5d5e241fb9
 2022-01-17 06:11:19 +00:00
Yi-yo Chiang
c06825ad77 Merge "Add boot*.img to default dist target if PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST" am: 4fe2a45dc7 am: 2f2c110829 
Original change: https://android-review.googlesource.com/c/platform/build/+/1944700

Change-Id: Ib75aeec243d53c8bb49202249f6ec4e5a36600a9
 2022-01-17 06:02:34 +00:00
Yi-yo Chiang
14d0e73497 Merge changes from topic "gki-avb-vts" am: 8b4e2fd6c0 am: b45caeb134 am: f2c62d7ddb am: e3874400a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941496

Change-Id: I252c986a2e0a15df168a14ac4d31f19f9f0dc19b
 2022-01-17 05:51:06 +00:00