tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
76844 commits 1 branch 0 tags 119 MiB
Commit graph

76844 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank Wang
eab618f455 Merge "Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS" 2022-01-24 22:36:49 +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
a4bb5a404f Merge "Fix initbootimage .PHONY target" am: 4724f77bca 
Original change: https://android-review.googlesource.com/c/platform/build/+/1956276

Change-Id: Ia217a6f3f185b1ab1113c13b64803b4b6973bf49
 2022-01-24 15:32:51 +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
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
08fbf0f75a Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332 
Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2abcaf902b4817ee477ad57074dde7e587b6eb85
 2022-01-24 14:17:56 +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
Treehugger Robot
5b6d4a2e13 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" am: cf24fc2bf9 
Original change: https://android-review.googlesource.com/c/platform/build/+/1957899

Change-Id: Ie38dc9f09f7d6d77a4eb2452a07c4763d355b2ea
 2022-01-23 01:15:17 +00:00
Treehugger Robot
cf24fc2bf9 Merge "core/Makefile: system_dlkm: Fix non avb dep typo" 2022-01-23 01:00:45 +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
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