Commit graph

7688 commits

Author SHA1 Message Date
George Chang
cbe108cdef Merge "Add nfc HAL ndk to gsi" am: bf42125c2d am: 761e2e944b am: 5102f4c7c3
Original change: https://android-review.googlesource.com/c/platform/build/+/1878200

Change-Id: I0a528ddbdb1c4f94bfc26e286cdf4ae36ee1971e
2022-01-22 02:39:15 +00:00
George Chang
5baca438e6 Add nfc HAL ndk to gsi
Bug: 204868826
Test: m
Change-Id: I5f590bcc401170b565fb6684ac343d84fb0bdc5e
2022-01-20 03:49:15 +00:00
Paul Hu
89d7061ed3 Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" 2022-01-20 03:02:56 +00:00
paulhu
74be28c733 Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS
framework-connectivity-tiramisu is the new jar in tethering apex
which is added since android T.

Bug: 206893064
Test: m
Merged-In: I04a89be2145fa180de4a51c5056f41d7a94a7399
Change-Id: I04a89be2145fa180de4a51c5056f41d7a94a7399
2022-01-19 11:04:30 +00:00
Treehugger Robot
e2647e13a8 Merge "Remove clatd" am: 3cf8f4b061 am: 0e00550664 am: 551a9edf7c
Original change: https://android-review.googlesource.com/c/platform/build/+/1948621

Change-Id: I524955a5af59705186855a34d23bdfc86847d027
2022-01-15 01:00:56 +00:00
Nucca Chen
aa5fc6ecbd Remove clatd
clatd have been moved to apex module.

Test: TH

Change-Id: Ibcb32225098883b4098807da6468a539e1c41c0c
2022-01-14 14:02:05 +00:00
Treehugger Robot
806c252953 Merge "Updates OWNERS file" am: 35efbedb4f am: dd52cdce2e am: 14e6ca5053
Original change: https://android-review.googlesource.com/c/platform/build/+/1944687

Change-Id: I34fbfa9fe76da1688a6b680d80de8a2a3fae5bf5
2022-01-12 04:32:54 +00:00
Treehugger Robot
35efbedb4f Merge "Updates OWNERS file" 2022-01-12 03:37:34 +00:00
Treehugger Robot
ce1c150981 Merge "Make com.android.sepolicy mandatory" am: 7297032a8d am: 316b3b71e0 am: 50c9214e69
Original change: https://android-review.googlesource.com/c/platform/build/+/1924017

Change-Id: Ie2adfb4f6417a568cc2e31d404418e69d620f19e
2022-01-11 14:59:30 +00:00
Treehugger Robot
7297032a8d Merge "Make com.android.sepolicy mandatory" 2022-01-11 14:11:37 +00:00
Bowgo Tsai
221628f342 Updates OWNERS file
gsi_keys.mk has been removed on commit
I3714de75b94be43a1364b89b92d893b336aa014b. Removing it from
the OWNERS file and adds developer_gsi_keys.mk.

Bug: 176869478
Test: presubmit
Change-Id: I2eeee65a244c4987f217f004ec47a0b6dca9b564
2022-01-11 11:13:25 +08:00
Jeff Vander Stoep
fe91d896ee Make com.android.sepolicy mandatory
Bug: 199914227
Test: aosp/1910032
Change-Id: I23599517b427363e758e6f06763079cc1482cb47
Merged-In: I23599517b427363e758e6f06763079cc1482cb47
2022-01-10 10:28:39 +00:00
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
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
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
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
Steven Moreland
d95de7fdc2 Merge "Don't require current.txt order." am: 9ca3c34646 am: 8e9e313bf4 am: 45259cd69d
Original change: https://android-review.googlesource.com/c/platform/build/+/1932881

Change-Id: I8c3de047bdd3dd38735939b92d11e2e0b9f0525e
2022-01-05 22:56:11 +00:00
Steven Moreland
9ca3c34646 Merge "Don't require current.txt order." 2022-01-05 22:09:27 +00:00
Treehugger Robot
dca625aed6 Merge "Remove GKI_SIGNING args from recovery & debug boot image build rules" am: 5203f2b1e0 am: af48f4be53 am: 259deaacd8
Original change: https://android-review.googlesource.com/c/platform/build/+/1934208

Change-Id: I76a0b8e56bf8e269d170f9159bdb306e199c084f
2022-01-05 17:51:55 +00:00
Jacky Liu
beb0b6927c Add PRODUCT_EXTRA_OTA_KEYS to add extra ota keys in otacerts.zip
Equivalent to PRODUCT_EXTRA_RECOVERY_KEYS but for A/B OTA.

Bug: 211848136
Test: set PRODUCT_EXTRA_OTA_KEYS and check otacerts.zip
Change-Id: I81e27d12a22b405f6227b09c01ed684dfcede19e
2022-01-05 17:54:40 +08:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
2022-01-05 02:59:45 +00:00
Treehugger Robot
a5726efd0a Merge "Re-landing "removing gsi_keys.mk"" am: 8c861cec97 am: 87d6967714 am: 6c73a8ae5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1931644

Change-Id: Ib52aaa3d34f06e5b744148cffc8f402d93d34449
2021-12-27 03:48:05 +00:00
Bowgo Tsai
b30a23cca2 Re-landing "removing gsi_keys.mk"
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I3714de75b94be43a1364b89b92d893b336aa014b
2021-12-24 12:28:32 +08:00
Steven Moreland
15b89d8fcd Don't require current.txt order.
There have been a lot of merge conflicts because of this file (and a
few cases of people needing to merge changes internally because of
it). Though, we really don't care about the order of the file. So,
compare ignoring order. If there is a merge conflict in the future,
we can change the order slightly, and we can gradually clean up the
order over time, as needed (really, it's not important).

Bug: N/A
Test: file reordered as build-time check
Change-Id: I955a2bd78872ff6d975bc494f10b2ed5e532c680
2021-12-23 22:18:42 +00:00
Treehugger Robot
b3e1308797 Merge "Update comments for Makefile variables about APEX jars." am: e685560087 am: 3cc272c031 am: dbe5fcc828
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I6418516104d706c25cc27cc7cca5a46016d6af05
2021-12-22 19:37:54 +00:00
Treehugger Robot
dbe5fcc828 Merge "Update comments for Makefile variables about APEX jars." am: e685560087 am: 3cc272c031
Original change: https://android-review.googlesource.com/c/platform/build/+/1931602

Change-Id: I77c3c8e180d1134db2cf86010954c16e1870d85e
2021-12-22 19:19:19 +00:00
Jiakai Zhang
49377db572 Update comments for Makefile variables about APEX jars.
Modules available in Q should not add new entries to
PRODUCT_APEX_*_JARS. Otherwise, there will be problems when a Q device
gets new modules and then OTAs to S, in which case, the device will have
the S version of SdkExtension (because SdkExtension is not available in
Q, see go/mainline-ota-problem), and the S version of SdkExtension
cannot consume those new entries correctly.

Bug: 203198541
Test: N/A
Change-Id: I15367ca59a06b4ee5fdb3803f2e4615b5d03b458
2021-12-22 13:38:17 +00:00
Ayush Sharma
adce3569a8 Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762 am: 59e76276de am: f1974fe82c
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I0fd6ca573b07929d8d9381973aba9ac7d0c160ab
2021-12-22 13:09:35 +00:00
Ayush Sharma
f1974fe82c Merge "Revert "Removing gsi_keys.mk"" am: 9d68bcd762 am: 59e76276de
Original change: https://android-review.googlesource.com/c/platform/build/+/1931081

Change-Id: I7ea72162f32a0da0f81d15804892bf9b47c21738
2021-12-22 12:55:04 +00:00
Ayush Sharma
0ab9187f01 Revert "Removing gsi_keys.mk"
This reverts commit 5d2cf578d6.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-qpr1-dev-plus-aosp&target=build_test3&lkgb=8021524&lkbb=8021634&fkbb=8021569, bug https://buganizer.corp.google.com/issues/211737534

Bug: 211737534
Change-Id: I40e8dce5d87a1ba08a6f100fc2af92dd94fd2d5c
2021-12-22 11:56:11 +00:00
Treehugger Robot
56300eb6bd Merge "Removing gsi_keys.mk" am: 09d30489b3 am: 139a73dcc0 am: b350bf36ac
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: I97ba7994007904eb39baa8e5a479aced75307b5b
2021-12-22 10:30:08 +00:00
Treehugger Robot
b350bf36ac Merge "Removing gsi_keys.mk" am: 09d30489b3 am: 139a73dcc0
Original change: https://android-review.googlesource.com/c/platform/build/+/1928391

Change-Id: I1e4738bee330e96b23ffa639dbc20b2dca652d75
2021-12-22 10:14:21 +00:00
Bowgo Tsai
5d2cf578d6 Removing gsi_keys.mk
It's no longer required to install the compliance GSI
public keys into the ramdisk. Those public keys just need
to be included in the VTS test suite for GSI verification.

Bug: 176869478
Test: TreeHugger
Change-Id: I26c4a1c7dba28a3c8cf88af64d8539fdc23a4f28
2021-12-22 13:11:32 +08:00
Treehugger Robot
cfebdda7c9 DO NOT MERGE Merge "Update vndk list with dice hal libraries." am: 06c7e31f01 am: 608be6d592
Original change: https://android-review.googlesource.com/c/platform/build/+/1906731

Change-Id: I984bc310a06e6c769270a3272fbac75d6aeae01b
2021-12-16 20:54:42 +00:00
Treehugger Robot
d9675cc22d Merge "Update vndk list with dice hal libraries." am: 06c7e31f01 am: 608be6d592
Original change: https://android-review.googlesource.com/c/platform/build/+/1906731

Change-Id: I984bc310a06e6c769270a3272fbac75d6aeae01b
2021-12-16 20:53:03 +00:00
Gabriel Biren
cfd8d0ef1b Merge "Add Wifi supplicant AIDL interface support." am: 23e4ccd2ba am: ac3f304f30 am: 7dd0c7905e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16482080

Change-Id: I00d7a855c7e71f76eec17ee0fabe136e38f03190
2021-12-16 18:49:54 +00:00
Gabriel Biren
7dd0c7905e Merge "Add Wifi supplicant AIDL interface support." am: 23e4ccd2ba am: ac3f304f30
Original change: https://android-review.googlesource.com/c/platform/build/+/1859994

Change-Id: Ie3980bc12b0e74b69c1949916b352360c0debf32
2021-12-16 15:43:32 +00:00
Treehugger Robot
06c7e31f01 Merge "Update vndk list with dice hal libraries." 2021-12-16 00:16:45 +00:00
Gabriel Biren
23e4ccd2ba Merge "Add Wifi supplicant AIDL interface support." 2021-12-15 21:13:41 +00:00
paulhu
75d42d7fac Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS
framework-connectivity-tiramisu is the new jar in tethering apex
which is added since android T.

Bug: 206893064
Test: m
Merged-In: I04a89be2145fa180de4a51c5056f41d7a94a7399
Change-Id: I04a89be2145fa180de4a51c5056f41d7a94a7399
2021-12-15 02:22:59 +00:00
Yi-yo Chiang
7b42795949 Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919 am: eb921708da
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ibff899fa9a190da527da6c9cef4ddc5dfdf1c4b2
2021-12-14 12:32:56 +00:00
Yi-yo Chiang
eb921708da Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ie54ddd87020a272e6e3ec0494c4faeaa7c116840
2021-12-14 12:11:16 +00:00
Yi-yo Chiang
90b0039a9d Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" 2021-12-14 11:39:03 +00:00
Akilesh Kailash
3791ff3cf6 Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea am: 1b14617cdb
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I96e2ec314768bf9899bd3ea83e9bcbed0ccdc648
2021-12-10 20:32:55 +00:00
Akilesh Kailash
1b14617cdb Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I9fe57a883f46b38c1fb891777e8d2a06c33466dc
2021-12-10 20:15:43 +00:00
Akilesh Kailash
3f5f0b306d Merge "Enable userspace snapshots for OTA" 2021-12-10 19:44:48 +00:00