Commit Graph

77178 Commits

Author SHA1 Message Date
Ramji Jiyani
f20e06e165 Merge "Add support to build system_dlkm.img" am: 1a40ac361e
Original change: https://android-review.googlesource.com/c/platform/build/+/1955977

Change-Id: I3a35d4a8e76007db8f8f167178b668c191156712
2022-01-22 10:26:45 +00:00
Ramji Jiyani
1a40ac361e Merge "Add support to build system_dlkm.img" 2022-01-22 10:07:18 +00:00
George Chang
145e0f89ab Merge "Add nfc HAL ndk to gsi" am: bf42125c2d am: 761e2e944b am: 5102f4c7c3 am: cbe108cdef
Original change: https://android-review.googlesource.com/c/platform/build/+/1878200

Change-Id: I1c26c55a0fb90732065071edf3733fa55bfc5d37
2022-01-22 02:57:38 +00:00
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
5102f4c7c3 Merge "Add nfc HAL ndk to gsi" am: bf42125c2d am: 761e2e944b
Original change: https://android-review.googlesource.com/c/platform/build/+/1878200

Change-Id: I2485015548e1589d6747be60a3e74e993c64a132
2022-01-22 02:27:54 +00:00
George Chang
761e2e944b Merge "Add nfc HAL ndk to gsi" am: bf42125c2d
Original change: https://android-review.googlesource.com/c/platform/build/+/1878200

Change-Id: I956f8c91e7cabd8790fd1fca5becd77d576ee436
2022-01-22 01:59:52 +00:00
George Chang
bf42125c2d Merge "Add nfc HAL ndk to gsi" 2022-01-22 01:46:41 +00:00
Badhri Jagan Sridharan
a3066973d1 Merge "Add android.hardware.usb-V1 to vndk" 2022-01-22 01:20:20 +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
Treehugger Robot
d55d83e475 Merge "Generalize @Keep annotation Proguard rules" am: 7ef84931aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1923477

Change-Id: Id9028cc35e346b1ac677861a8b2b471682e47a3d
2022-01-21 23:50:07 +00:00
Frank Wang
cce4c7d3a9 Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS
Test: Builds
Bug: b/210728915
Change-Id: I7cf3b31b099b6d27ae1a443f1856421c111ebf62
2022-01-21 23:31:15 +00:00
Treehugger Robot
7ef84931aa Merge "Generalize @Keep annotation Proguard rules" 2022-01-21 23:27:25 +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
Chih-hung Hsieh
44fe96fdc1 Merge "Lower severity of 3 tidy warnings" am: 95ec3b899e am: 3ff26134dc am: c33c74dd00 am: db527f5ebe
Original change: https://android-review.googlesource.com/c/platform/build/+/1955365

Change-Id: Ia869a6be3aa6dec39ca4df71c3528d29238da064
2022-01-21 05:18:26 +00:00
TreeHugger Robot
f33611c11a Merge "Remove the duplicate RBE_CXX_COMPARE config." 2022-01-21 05:18:05 +00:00
Chih-hung Hsieh
db527f5ebe Merge "Lower severity of 3 tidy warnings" am: 95ec3b899e am: 3ff26134dc am: c33c74dd00
Original change: https://android-review.googlesource.com/c/platform/build/+/1955365

Change-Id: Ibb98d01fb15f9b5eaceea9fcc617837523e61b33
2022-01-21 04:48:22 +00:00
Chih-hung Hsieh
c33c74dd00 Merge "Lower severity of 3 tidy warnings" am: 95ec3b899e am: 3ff26134dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1955365

Change-Id: Ia09f91886c68d9ad9380273271a78b8b2058bf7f
2022-01-21 04:31:33 +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
Chih-hung Hsieh
3ff26134dc Merge "Lower severity of 3 tidy warnings" am: 95ec3b899e
Original change: https://android-review.googlesource.com/c/platform/build/+/1955365

Change-Id: Ib0b704a01a25c0ea03e0b0a36d220c70d0e90994
2022-01-21 04:13:36 +00:00
Chih-hung Hsieh
95ec3b899e Merge "Lower severity of 3 tidy warnings" 2022-01-21 03:53:45 +00:00
Chih-Hung Hsieh
02f0df83fc Lower severity of 3 tidy warnings
* bcmp/bcopy/bzero are not insecureAPI on Android.
* Android projects may enable/disable clang-tidy checks locally;
  warn/*patterns.py keep global classification of all warnings.

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I7720f7babd0a33c1b6602c9a8bb67565c45db94e
2022-01-20 16:13:12 -08:00
Nikita Ioffe
e08d6715bb Merge "Add services-supplementalprocess to system server classpath" 2022-01-20 21:12:43 +00:00
John Reck
eac3339456 Merge "Add IAllocator stable-aidl to VNDK" 2022-01-20 20:21:51 +00: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
Paul Hu
1a4752be96 [automerger skipped] Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3 am: d59bc31553 am: 32cfa4de74 -s ours am: a5fe0f32f2 -s ours
am skip reason: Merged-In I04a89be2145fa180de4a51c5056f41d7a94a7399 with SHA-1 74be28c733 is already in history

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

Change-Id: Ibcd9b50f87299cb24e52caac9e8cd3ca8cd02425
2022-01-20 06:11:04 +00:00
Paul Hu
a5fe0f32f2 [automerger skipped] Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3 am: d59bc31553 am: 32cfa4de74 -s ours
am skip reason: Merged-In I04a89be2145fa180de4a51c5056f41d7a94a7399 with SHA-1 74be28c733 is already in history

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

Change-Id: I34c490aa6ca46f1b8642f94cd2fc43b46d7b8a31
2022-01-20 05:49:38 +00:00
Paul Hu
32cfa4de74 Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3 am: d59bc31553
Original change: https://android-review.googlesource.com/c/platform/build/+/1921477

Change-Id: Id907f9237ce0edb3b6d855639db88336fd954639
2022-01-20 05:37:22 +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
d59bc31553 Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" am: 89d7061ed3
Original change: https://android-review.googlesource.com/c/platform/build/+/1921477

Change-Id: Id913c805ee00da54a413d2c6111d18b660781375
2022-01-20 03:25:17 +00:00
Paul Hu
89d7061ed3 Merge "Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS" 2022-01-20 03:02:56 +00:00
paulhu
40339b9e4b [automerger skipped] Add framework-connectivity-tiramisu to PRODUCT_APEX_BOOT_JARS am: 74be28c733 -s ours
am skip reason: Merged-In I04a89be2145fa180de4a51c5056f41d7a94a7399 with SHA-1 627b72a105 is already in history

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

Change-Id: I3d3eec517c2cbed46490240006dc348a05d707db
2022-01-19 16:50:02 +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
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
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
6332808700 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" am: 5fe798bea0
Original change: https://android-review.googlesource.com/c/platform/build/+/1953525

Change-Id: I89fafa01cb74dc0ef5ba316f5ca95718978a7baa
2022-01-19 06:18:25 +00:00
Pirama Arumuga Nainar
5fe798bea0 Merge "Revert "Set a BIONIC_COVERAGE .mk variable"" 2022-01-19 06:03:25 +00:00
Treehugger Robot
15423781f6 Merge "Add erofs compressor type param" am: d698e3e0b0 am: 8988b57027 am: 0a697caa2b am: 6d70ba5041
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257

Change-Id: If9adb8f042daad86245b1a2b900429c37b53cd4d
2022-01-19 03:37:07 +00:00
Treehugger Robot
6d70ba5041 Merge "Add erofs compressor type param" am: d698e3e0b0 am: 8988b57027 am: 0a697caa2b
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257

Change-Id: I9e05b94293861f47a4b731b85424cd4a4b418465
2022-01-19 03:12:38 +00:00
Treehugger Robot
0a697caa2b Merge "Add erofs compressor type param" am: d698e3e0b0 am: 8988b57027
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257

Change-Id: I179329b9ee6643e457a5aabced2fee44f6693188
2022-01-19 02:59:19 +00:00
Treehugger Robot
8988b57027 Merge "Add erofs compressor type param" am: d698e3e0b0
Original change: https://android-review.googlesource.com/c/platform/build/+/1949257

Change-Id: I069ef8bdb33a21d74276b4a9893636740cd42c41
2022-01-19 02:48:21 +00:00
Treehugger Robot
d698e3e0b0 Merge "Add erofs compressor type param" 2022-01-19 02:32:30 +00:00
Treehugger Robot
b179f9e6cf Merge "Fix formatting error" am: 5d14dfa2fd am: c5f019bf71 am: 286491047d am: c717997920
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324

Change-Id: I37cc4c3de15bf4a6508b46e72d3e233b068e3e81
2022-01-19 01:01:00 +00:00
Treehugger Robot
c717997920 Merge "Fix formatting error" am: 5d14dfa2fd am: c5f019bf71 am: 286491047d
Original change: https://android-review.googlesource.com/c/platform/build/+/1952324

Change-Id: Ibf506a74f468152f0775d88e96b8da99e6c4c831
2022-01-19 00:43:59 +00:00