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

29321 Commits

Author SHA1 Message Date
Treehugger Robot
aa9f3054a1 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf am: 4d1a91b455 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I975fdc387f0eefd898dd0475521c9b43ffdc3e44
 2022-01-08 19:17:50 +00:00
Treehugger Robot
4d1a91b455 Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 am: d75823a4bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I32ef66c673653e2ed32bd824c6d59a181327a222
 2022-01-08 19:06:33 +00:00
Treehugger Robot
d75823a4bf Merge "Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B)))" am: 6a95477b0f am: 4f8d04b603 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941497

Change-Id: I4a164373f540863d6f7062347e9eb90261659202
 2022-01-08 18:54:23 +00:00
Yi-Yo Chiang
8193900f87 Change ifneq(,$(A) $(B)) to ifneq(,$(strip $(A) $(B))) 
Else the branch condition would always evaluate to true, making the
other branch useless and wrong!

Bug: 211741246
Test: m dist
Change-Id: I4791712632cbe0d5a9e20962c8425dd20bbe0bfd
 2022-01-08 15:59:02 +00:00
Treehugger Robot
17555f1157 Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e am: 51d95fc646 am: a96408cb32 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: Ic75c69859fef81740642f854400456810d34f343
 2022-01-07 23:35:25 +00:00
Treehugger Robot
a96408cb32 Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e am: 51d95fc646 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: I140d0188356062ba214289fc60d2cef5310b3551
 2022-01-07 23:20:55 +00:00
Treehugger Robot
51d95fc646 Merge "Add missing dependencies of fs-verity manifest APK" am: d541c6c898 am: c10c51039e 
Original change: https://android-review.googlesource.com/c/platform/build/+/1941183

Change-Id: Iefb5d275489b9c5adce2e5a621557d06326322d1
 2022-01-07 23:07:01 +00:00
Treehugger Robot
d541c6c898 Merge "Add missing dependencies of fs-verity manifest APK" 2022-01-07 22:28:25 +00:00
Victor Hsieh
be1029af71 Add missing dependencies of fs-verity manifest APK 
Otheriwse, the build complains about missing files when
PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA is enabled (aosp/1937717).

Bug: 206326351
Test: clobber, set PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true, build
Change-Id: I11d18914d63cab0b84ae711f2334747cb26ca234
 2022-01-07 11:07:52 -08:00
Bill Yi
1ebd070c8d Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:11 +00:00
Yi-yo Chiang
118eb02283 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 am: 21013eaa18 am: bb52d2bc9d am: 246e4a3e06 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: I45530f98bec5eebb7437adefe000fd717715e7b6
 2022-01-07 06:29:55 +00:00
Yi-yo Chiang
8c6de6b0ec Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa am: c0db3151ce am: 94e499b4e2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: I3e03404ad18edc127daef02d6f11b5b5aef14b92
 2022-01-07 06:29:26 +00:00
Yi-yo Chiang
246e4a3e06 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 am: 21013eaa18 am: bb52d2bc9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: I1525b4622f1bb5450abca544c0f0e1b9ddc24538
 2022-01-07 06:13:12 +00:00
Yi-yo Chiang
94e499b4e2 Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa am: c0db3151ce 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: Ic00a587220728e5ad253c1407381074f2fa37ba0
 2022-01-07 06:13:02 +00:00
Yi-yo Chiang
bb52d2bc9d Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 am: 21013eaa18 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: I2de2ea18016b144882859a4f0b222e29a62dbfd7
 2022-01-07 05:56:37 +00:00
Yi-yo Chiang
c0db3151ce Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f am: 5efc0feefa 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: Id4e5f7272b0debf649c4cef83c9eb835b060fb90
 2022-01-07 05:56:21 +00:00
Yi-yo Chiang
21013eaa18 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ec918431a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1860893

Change-Id: Iaa9365f9f6ff51a7accb95da3093886969925b9d
 2022-01-07 05:42:41 +00:00
Yi-yo Chiang
5efc0feefa Merge "Unconditionally copy the system build.prop into target_files archive" am: 5709c4a93f 
Original change: https://android-review.googlesource.com/c/platform/build/+/1935974

Change-Id: I1801eff75b29ed42fbde2129e2366ec8ae0b5969
 2022-01-07 05:42:24 +00:00
Yi-yo Chiang
ec918431a5 Merge "Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" 2022-01-07 05:30:23 +00:00
Yi-yo Chiang
5709c4a93f Merge "Unconditionally copy the system build.prop into target_files archive" 2022-01-07 05:27:35 +00:00
Treehugger Robot
cfbdb4bd4a Merge "Move fsverity metadata generation to Makefile" am: 7c88c9c1e6 am: 2d6411ed06 am: eea503cf81 am: 9c4a78ceae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937129

Change-Id: I8a3b44b5cd20af1089dccd61c041e8cd97638fda
 2022-01-07 04:39:34 +00:00
Treehugger Robot
9c4a78ceae Merge "Move fsverity metadata generation to Makefile" am: 7c88c9c1e6 am: 2d6411ed06 am: eea503cf81 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937129

Change-Id: I63acc3d03045313d621b3b5790f617651fe9ee60
 2022-01-07 04:22:58 +00:00
Treehugger Robot
eea503cf81 Merge "Move fsverity metadata generation to Makefile" am: 7c88c9c1e6 am: 2d6411ed06 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937129

Change-Id: I2f671ca03738e5fffb9f187f03c191abe3aa0d9b
 2022-01-07 04:03:05 +00:00
Treehugger Robot
2d6411ed06 Merge "Move fsverity metadata generation to Makefile" am: 7c88c9c1e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1937129

Change-Id: I67b18122ed2fae0ad5a4f0684e257fd6f21063fc
 2022-01-07 03:48:55 +00:00
Treehugger Robot
7c88c9c1e6 Merge "Move fsverity metadata generation to Makefile" 2022-01-07 03:37:16 +00:00
Bill Yi
5a77fbf008 Merge sc-qpr1 to aosp-master - DO NOT MERGE 
Merged-In: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
Merged-In: I71f542d511cf6397d84d40b1fb688c307cdd386e
Change-Id: Id5d2b7b2b18ae1a1919a53121c06fb309e5b2eee
 2022-01-06 18:38:30 -08:00
Treehugger Robot
d0ec276563 Merge "Export test data dependencies in module-info" am: 802c86f831 am: 2a04f251b9 am: ca2783c384 am: 404cd2b1c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: Id6a699bfa3babbb905b00075b2f29ccb580cae51
 2022-01-07 01:45:41 +00:00
Bill Yi
4867e1ad0e Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-01-07 01:41:28 +00:00
Treehugger Robot
404cd2b1c9 Merge "Export test data dependencies in module-info" am: 802c86f831 am: 2a04f251b9 am: ca2783c384 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: Ic018f7692b31cf6d49a5a43a2d4e9192f0983111
 2022-01-07 01:28:55 +00:00
Treehugger Robot
ca2783c384 Merge "Export test data dependencies in module-info" am: 802c86f831 am: 2a04f251b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: I1b42b3e7acdaa94a6b6b1920159c481e6f814995
 2022-01-07 01:15:32 +00:00
Treehugger Robot
802c86f831 Merge "Export test data dependencies in module-info" 2022-01-07 00:36:54 +00:00
Inseob Kim
135c1f144f Move fsverity metadata generation to Makefile 
build_image.py has been handling fsverity metadata generation in the
packing step, but it can cause issues because the metadata files are
missing in the $OUT directory, and they only exist in result system.img.
This change moves the generation logic into Makefile, and makes the
metadata tracked by ninja graph.

Bug: 206326351
Test: PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true and build
Change-Id: I1f910d8ac6e2cc3c54f35916871733c632f18e44
 2022-01-07 09:16:42 +09:00
Spandan Das
06e06876f8 Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 am: 362bf03c3b am: 0d3e1277c6 am: d726f5375c 
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ic7e92dce0a154bd9b4d03a93884a39c7b62aeb79
 2022-01-06 23:29:44 +00:00
Spandan Das
d726f5375c Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 am: 362bf03c3b am: 0d3e1277c6 
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ic2119ae12d3b0b512533a5bc234e2eab6915cbcd
 2022-01-06 23:13:09 +00:00
Spandan Das
0d3e1277c6 Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2 am: 362bf03c3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ie3d1f00336f86542103bda4b33d9b9d03e9e3927
 2022-01-06 23:00:13 +00:00
Spandan Das
13daf3d4a2 Merge "Move manifest generation logic into static_java_library.mk" 2022-01-06 22:21:03 +00:00
Yi-Yo Chiang
9b2584170e Unconditionally copy the system build.prop into target_files archive 
releasetools preconditions requires build metadata defined in
SYSTEM/build.prop even when building a system.img-less product.
Copy the SYSTEM/build.prop into the build artifact archive whenever
possible to make add_img_to_target_files happy.

Bug: 212486689
Bug: 213028932
Test: Dist build a system.img-less product. Product properties are
  read from SYSTEM/build.prop and no build error occurred.
Change-Id: I2ce7f8b8ae981eaf06e2d8d2485b55b4e975caa9
 2022-01-07 03:29:14 +08:00
Spandan Das
68684bea79 Move manifest generation logic into static_java_library.mk 
Previously a manifest file would be generated for static_java_library.mk
and package_internal.mk. For pacakge_internal.mk, this would cause
cryptic errors like b/188612215#2

With this CL, a manifest file would only be generated for java_library
with need_compile_res == true. The advantages are
1. No redundant generation for java_library with need_compile_res == false
(i.e. modules that do not require aapt2)
2. Force devs to provide manifest for android_app, and not silently
generating one for them

Bug: 188652897
Test: TH
Test: m nothing in tv-dev, car-dev

Change-Id: I69a23e373f1b4ac1569ae5b1d36067bfc0dadc05
 2022-01-06 18:47:57 +00:00
Treehugger Robot
2a9e4e85c6 Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139 am: 49aceda26d am: 2d8e1811af 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: If3251ca8d42b315eb68a8b5b915f26cb0de86913
 2022-01-06 15:09:38 +00:00
Treehugger Robot
2d8e1811af Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139 am: 49aceda26d 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: Ic6ce9af00e01b48e9a381282822ddf608f72b59f
 2022-01-06 14:52:06 +00:00
Treehugger Robot
49aceda26d Merge "Fix build error on empty root folder" am: e33e7e518c am: 7e2a59a139 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: Iff59cf36aba9c8db81765df61e40724b762dedaf
 2022-01-06 14:38:40 +00:00
Treehugger Robot
e33e7e518c Merge "Fix build error on empty root folder" 2022-01-06 13:54:27 +00:00
Jacky Liu
0e3352a241 Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 am: 429e1f339b am: 5f1bdb32ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: Ic9e4bdd75e95d6df1595e1371977a532ae830db3
 2022-01-06 07:37:19 +00:00
Jacky Liu
5f1bdb32ae Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 am: 429e1f339b 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I79f822306e48c9de2dc76d5f6edd6f27041369d1
 2022-01-06 07:17:43 +00:00
Jacky Liu
429e1f339b Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" am: bff997fd1f am: 4f9eb6b9e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934214

Change-Id: I1c164c7697ae10012f540677ce2423fe014e5e18
 2022-01-06 06:58:05 +00:00
Yi-Yo Chiang
b225d8c499 Verbose warning message for PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT 
I56ed328a9ae70cf49dbd3c6efb5a4a8c54e1b7a7 added a validation check to
otatools to check the target_files archive for the existence of
userdebug_plat_sepolicy.cil. That check superseded the original
PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT product_config.mk check and
is more robust because it can handle not only phone GSI but also car/tv
GSI (downstream of phone GSI).

Modify the check to show a scary wall of text if non-compliance-GSI
products tried to set PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT,
instead of erroring out immediately.
Also add gsi_car_arm64 & gsi_car_x86_64 to the list of eligible GSI
product names.

After this change, any product can set
PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT for development purposes, but
only GSI products that specifies `--allow_gsi_debug_sepolicy` during
image signing can release sign a product built with
PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT.

Bug: 188067818
Test: Presubmit
Test: lunch gsi_arm64-userdebug && m nothing  # => no warning
Change-Id: I34ef49af29c7064bea8924b0070793f1e78256bf
 2022-01-06 06:37:05 +00:00
Jacky Liu
bff997fd1f Merge "Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip" 2022-01-06 06:31:37 +00:00
Bill Yi
f6125cb188 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE 
Merged-In: Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128
Change-Id: Ice7e337af7767a7c1a66a66c11fa37a8a69476df
 2022-01-05 21:10:46 -08:00
Treehugger Robot
e2d7185a0f Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 am: 7238491c1c am: a0e28118af am: 3f357470d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: I73827e38bf2f3a57affea93ba6c9745d3e5111c3
 2022-01-06 05:09:00 +00:00
Treehugger Robot
3f357470d2 Merge "Calls check-and-set-avb-args() when the system.img exists" am: 99bec02344 am: 7238491c1c am: a0e28118af 
Original change: https://android-review.googlesource.com/c/platform/build/+/1934176

Change-Id: I5bfe28ee0af83c4946eb8ad6ba05f5a770eeecb3
 2022-01-06 04:47:55 +00:00