Commit graph

74520 commits

Author SHA1 Message Date
Treehugger Robot
5f1458f6d9 Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da am: a029ebb6dc am: 1f7cbd5dd6
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: I4f72846d4d54f53e9f4396c6ef5aca9b638d387f
2022-01-07 16:18:04 +00:00
Treehugger Robot
e2a927ed97 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 am: 03990e11c4 am: d695dfdc70
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: Ifb11629a6fd8e2711692f92d1a61e465c3108780
2022-01-07 16:16:30 +00:00
Treehugger Robot
1f7cbd5dd6 Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da am: a029ebb6dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: Ibe52ddcbe6a70ad77e8eeb7fcf9b9e751677601c
2022-01-07 15:56:43 +00:00
Treehugger Robot
d695dfdc70 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063 am: 03990e11c4
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: Ieeec05c4a07fa886fefc63605f4ce0449f92c4f2
2022-01-07 15:55:02 +00:00
Treehugger Robot
a029ebb6dc Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" am: 097f6bc1da
Original change: https://android-review.googlesource.com/c/platform/build/+/1908872

Change-Id: I59037fa9eb46f8abf22f26e8c3f77c5cc68eb341
2022-01-07 13:28:43 +00:00
Treehugger Robot
03990e11c4 Merge "Add a.hardware.audio.common and a.media.audio.common" am: 1c2c284063
Original change: https://android-review.googlesource.com/c/platform/build/+/1937128

Change-Id: I7e3c5ef5a50f6ebe8efca6d409fcd6bab19c9fc2
2022-01-07 13:26:35 +00:00
Treehugger Robot
097f6bc1da Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" 2022-01-07 13:07:25 +00:00
Treehugger Robot
1c2c284063 Merge "Add a.hardware.audio.common and a.media.audio.common" 2022-01-07 13:07:10 +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
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
Treehugger Robot
447d5ec8ea Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265 am: a551c5d3d1 am: 2ba4030ac0
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I9c431b9206a3df6e62c23a1a0ed838c4adf8a1a1
2022-01-07 03:20:21 +00:00
Treehugger Robot
2ba4030ac0 Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265 am: a551c5d3d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I03570bb204f5d4f5a8c00a45c4867a859661f00a
2022-01-07 03:06:08 +00:00
Treehugger Robot
a551c5d3d1 Merge "Avoid packing ramdisk into GKI boot-*.img" am: bd5fd25265
Original change: https://android-review.googlesource.com/c/platform/build/+/1937120

Change-Id: I3d581b4d908ba8ab4760dc0ee415736f6406108a
2022-01-07 02:51:51 +00:00
Treehugger Robot
bd5fd25265 Merge "Avoid packing ramdisk into GKI boot-*.img" 2022-01-07 02:35:06 +00:00
Bill Yi
555f5b5c76 [automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 4867e1ad0e -s ours am: 098bfa13e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16573297

Change-Id: I3149b75e4c9592883d06e80f82f6459f986ef0fa
2022-01-07 02:22:59 +00:00
Bill Yi
098bfa13e2 [automerger skipped] Merge "Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 4867e1ad0e -s ours
am skip reason: Merged-In Idef27f4e0cd2e7a44a74a7be00fcc897d0a54128 with SHA-1 a0e28118af is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16573297

Change-Id: I71f542d511cf6397d84d40b1fb688c307cdd386e
2022-01-07 02:01:48 +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
2a04f251b9 Merge "Export test data dependencies in module-info" am: 802c86f831
Original change: https://android-review.googlesource.com/c/platform/build/+/1928387

Change-Id: I017a5d9c3cd227e0b1a4deaa8dface646bc0a887
2022-01-07 00:54:01 +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
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
362bf03c3b Merge "Move manifest generation logic into static_java_library.mk" am: 13daf3d4a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1835800

Change-Id: Ic71cff4d144e66e4528da4afe9b799eabb4aa723
2022-01-06 22:40:27 +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
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
7e2a59a139 Merge "Fix build error on empty root folder" am: e33e7e518c
Original change: https://android-review.googlesource.com/c/platform/build/+/1934213

Change-Id: I0c5b687ae5b69a1394e649b486b9ed11cd1d3d45
2022-01-06 14:17:48 +00:00
Treehugger Robot
e33e7e518c Merge "Fix build error on empty root folder" 2022-01-06 13:54:27 +00:00
Bowgo Tsai
88fc2bdd19 Avoid packing ramdisk into GKI boot-*.img
If init_boot.img is present, the GKI boot-*.img should
not include the ramdisk because the ramdisk will be packed
into the init_boot.img instead.

The "has_ramdisk" flag incorrectly checks the condition of:
prebuilt_name != "boot.img" to see if it is a boot.img.
Because "has_ramdisk" was added before we packed multiple
GKI boot-*.img, e.g., boot-5.10.img, boot-5.10-lz4.img, etc.,
into the target files.

Fix this by checking the partition_name is "boot" or not.
Also moving the logic into a new function with comments for each
condition.

Bug: 203698939
Bug: 213028932
Test: sign_target_files_apks \
        --gki_signing_key=external/avb/test/data/testkey_rsa4096.pem \
        --gki_signing_algorithm=SHA256_RSA4096 \
        ./out/dist/*-target_files-eng.*.zip signed.zip, then
        unpack_bootimg to checks the signed boot-*.img has no ramdisk
Change-Id: I5354669feb54d547dbe797e51b1b1baa187cb7cf
2022-01-06 17:50:04 +08:00
Josh Wu
6abae30df6 Add android.hardware.bluetooth.audio-V1-ndk.so
This is the package for the shared types of AIDL Audio HAL.

Bug: 203490261
Test: m
Change-Id: I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73
Merged-In: I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73
2022-01-05 23:44:27 -08:00
Josh Wu
408c7e40a5 Add a.hardware.audio.common and a.media.audio.common
This is the package for the shared types of AIDL Audio HAL.

Bug: 198812639
Test: m
Change-Id: Ia953963380794591eae6b1140d180dc36dfbe7ca
Merged-In: Ia953963380794591eae6b1140d180dc36dfbe7ca
2022-01-06 07:25:13 +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
Treehugger Robot
50bf9c8a11 Merge "Fix the signing error on no-system-image targets" am: 790214a4c9 am: ba922579b1 am: 2a00929dec
Original change: https://android-review.googlesource.com/c/platform/build/+/1936199

Change-Id: Ib77128446cc574c411faf226ca0ac4fc0a74eaba
2022-01-06 07:17:33 +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
Treehugger Robot
2a00929dec Merge "Fix the signing error on no-system-image targets" am: 790214a4c9 am: ba922579b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1936199

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

Change-Id: I46e405153c4a87a960d037312eb99c31103c8efc
2022-01-06 06:43:51 +00:00