Commit Graph

7903 Commits

Author SHA1 Message Date
Jiyong Park
d102ef0f8f Merge "Updated vndk library list after aidl-freeze-api" into sc-dev am: 33e79ba41e am: 2d97421205 am: c49f19e3f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14673216

Change-Id: Iaad90a262aa8cf2540379eb6cf6336ddb7061bc6
2021-05-25 23:40:11 +00:00
Jiyong Park
2d97421205 Merge "Updated vndk library list after aidl-freeze-api" into sc-dev am: 33e79ba41e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14673216

Change-Id: Ifac820d75d0575bb1c46aaf3f8635146adfc625a
2021-05-25 23:02:34 +00:00
Jiyong Park
33e79ba41e Merge "Updated vndk library list after aidl-freeze-api" into sc-dev 2021-05-25 22:43:41 +00:00
Christian Wailes
dee08a8473 Merge "RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath."" into sc-dev 2021-05-24 22:39:02 +00:00
Calin Juravle
c55bf19bd6 Merge "Add pm.dexopt.cmdline mapping in product config" into sc-dev 2021-05-24 21:34:29 +00:00
Chris Wailes
58a82ce77f RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath."
This reverts commit efe5ca180c.

Test: m
Bug: 184281926
Change-Id: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c
Merged-In: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c
2021-05-24 20:29:15 +00:00
TreeHugger Robot
63383e9d75 Merge "Add GKI to generic x86_64 board" into sc-dev 2021-05-24 17:49:03 +00:00
TreeHugger Robot
54cb463cce Merge "Move GKI common settings to BoardConfigGkiCommon.mk" into sc-dev 2021-05-24 17:48:59 +00:00
Calin Juravle
2a3110cd73 Add pm.dexopt.cmdline mapping in product config
Test: boot
Bug: 188655918
Merged-In: I527a71d0acec0ba6593b2da1fd13818cba3b4832
(cherry picked from commit ccb4cdc7f6)
Change-Id: Iaf4d76c44e7bd46f78fd507cd5d6af26d691a7f1
2021-05-24 09:53:07 -07:00
Calin Juravle
f70b15af5b Merge "Add pm.dexopt.cmdline mapping in product config" am: e9423b0b09 am: 0d5c92d999 am: 5d1ebf5793 am: 1ad062c401
Original change: https://android-review.googlesource.com/c/platform/build/+/1710928

Change-Id: I73581a6fa28199b5b4d09bfb32a6e411241710b2
2021-05-24 15:57:08 +00:00
Calin Juravle
5d1ebf5793 Merge "Add pm.dexopt.cmdline mapping in product config" am: e9423b0b09 am: 0d5c92d999
Original change: https://android-review.googlesource.com/c/platform/build/+/1710928

Change-Id: Ifeae812544cf841f8ac79fa6bfa3becafed25661
2021-05-24 15:48:03 +00:00
Calin Juravle
e9423b0b09 Merge "Add pm.dexopt.cmdline mapping in product config" 2021-05-24 15:06:35 +00:00
Jiyong Park
c6fcc77237 Updated vndk library list after aidl-freeze-api
Bug: 188713899
Test: m
Change-Id: Idf4293211069cfaa668eccb7cf382fec64353f0b
2021-05-24 08:56:47 +09:00
Michael Butler
f791bfa15c Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
Merged-In: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-21 19:58:01 +00:00
Michael Butler
d42066a913 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev am: e761c25b98 am: bbf26f35e4 am: b4f450ae7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14631649

Change-Id: I133bb6d5c7d1f974c0666b305e900867551a0c9f
2021-05-21 19:15:40 +00:00
Michael Butler
b4f450ae7f Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev am: e761c25b98 am: bbf26f35e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14631649

Change-Id: I6fc60366d88b49ca2f7c3424cd5156c9293c93b4
2021-05-21 18:32:39 +00:00
Michael Butler
f148483bb2 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev am: e761c25b98
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14631649

Change-Id: Ibd44720d2ab3ed364d21ecedf826f0121b666296
2021-05-21 18:23:58 +00:00
Michael Butler
e761c25b98 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev 2021-05-21 17:57:00 +00:00
Hsin-Yi Chen
6968d4dc9c Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
Merged-In: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
(cherry picked from commit b212b0a92a)
2021-05-20 03:22:27 +00:00
Chris Wailes
a1c3d7aa35 Add dalvik.vm.dexopt.thermal-cutoff system property
Test: Boot
Bug: 165935246
Bug: 181795682
Change-Id: I45a8f8d6c7e99feccacd0bc8897f791571bdd9c9
2021-05-19 16:41:41 +00:00
Tim Van Patten
ea48214581 Merge "Remove building the ANGLE APK from AOSP" 2021-05-19 15:40:27 +00:00
Calin Juravle
ccb4cdc7f6 Add pm.dexopt.cmdline mapping in product config
Test: boot
Bug: 188655918
Change-Id: I527a71d0acec0ba6593b2da1fd13818cba3b4832
2021-05-19 15:27:02 +00:00
Hsin-Yi Chen
0d79400300 Merge "Add GKI to generic x86_64 board" am: abd0ea8743 am: d6af325014 am: 2ee9b4480a
Original change: https://android-review.googlesource.com/c/platform/build/+/1699575

Change-Id: I67ba04c6da0eb7831a471f988437e2c3a823f30e
2021-05-19 14:27:32 +00:00
SzuWei Lin
7dd20bba70 Merge "Move GKI common settings to BoardConfigGkiCommon.mk" am: 5b77e84a6d am: 6493a23267 am: 2b84efab73
Original change: https://android-review.googlesource.com/c/platform/build/+/1705170

Change-Id: Iafe29d7f8b0d534b2775e5d16bfa61bd4926bb4d
2021-05-19 14:27:18 +00:00
Christian Wailes
9c53985d72 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" am: 6f21097ca5 am: 74a8572334 am: a652d97483
Original change: https://android-review.googlesource.com/c/platform/build/+/1706465

Change-Id: I55fb9ed922da298858f535962572daec10b3516d
2021-05-19 14:27:12 +00:00
SzuWei Lin
dea57a49e2 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
Merged-In: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-19 09:00:16 +00:00
Michael Butler
4f436d3760 Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Bug: 188587379
Test: mma
Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-18 18:05:03 -07:00
Tim Van Patten
e6d2d6c3dd Remove building the ANGLE APK from AOSP
Mark ANGLE as product-specific and remove building the APK. CuttleFish
will continue to build the ANGLE libraries directly.

Bug: b/187342779
Test: launch_cvd --restart_subprocesses=false --start_webrtc=true --gpu_mode=guest_swiftshader
Change-Id: I6cd379a11e0c198ad72636253f1a33f2d1fc798f
2021-05-18 11:58:23 -06:00
Mohammad Islam
2b85e3ace5 Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""
This reverts commit b695e761f1.

Reason for revert: b/185708645 has been fixed

Bug: 169780183
Bug: 185708645
Change-Id: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Test: Manually updated APEX with same version via OTA/adb-remount and observed it was decompressed.
2021-05-18 17:45:07 +00:00
Hsin-Yi Chen
2ee9b4480a Merge "Add GKI to generic x86_64 board" am: abd0ea8743 am: d6af325014
Original change: https://android-review.googlesource.com/c/platform/build/+/1699575

Change-Id: I447965031e7481d65e7fb80bcd7efdec3c7a2aac
2021-05-18 06:03:27 +00:00
Hsin-Yi Chen
abd0ea8743 Merge "Add GKI to generic x86_64 board" 2021-05-18 05:16:42 +00:00
Hsin-Yi Chen
b212b0a92a Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
2021-05-18 02:30:50 +00:00
SzuWei Lin
2b84efab73 Merge "Move GKI common settings to BoardConfigGkiCommon.mk" am: 5b77e84a6d am: 6493a23267
Original change: https://android-review.googlesource.com/c/platform/build/+/1705170

Change-Id: Id1b5263e99f1096b43b53cbd2848d9892fdc9101
2021-05-18 01:08:46 +00:00
SzuWei Lin
5b77e84a6d Merge "Move GKI common settings to BoardConfigGkiCommon.mk" 2021-05-18 00:26:12 +00:00
Christian Wailes
a652d97483 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" am: 6f21097ca5 am: 74a8572334
Original change: https://android-review.googlesource.com/c/platform/build/+/1706465

Change-Id: I19699238eeecc6875985f06e4f1726cde49a44e0
2021-05-17 20:19:12 +00:00
Christian Wailes
6f21097ca5 Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" 2021-05-17 16:15:40 +00:00
SzuWei Lin
a74ea7e569 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-17 01:53:17 +00:00
Treehugger Robot
1bd6f60955 Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46 am: 19b49a7b37 am: bb841af40d am: 46cff02f70
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: I7ae40f403c8e12ad0e69eb59210b29c200ae218a
2021-05-14 06:26:08 +00:00
Treehugger Robot
46cff02f70 Merge "Do not enforce debugfs restrictions on GSI builds" am: 04d72d0a46 am: 19b49a7b37 am: bb841af40d
Original change: https://android-review.googlesource.com/c/platform/build/+/1707468

Change-Id: I97f95e2f99e7b10c6852652b821eb59f76f05f8c
2021-05-14 06:12:44 +00:00
Treehugger Robot
04d72d0a46 Merge "Do not enforce debugfs restrictions on GSI builds" 2021-05-14 05:05:20 +00:00
Hridya Valsaraju
329d896e52 Do not enforce debugfs restrictions on GSI builds
Devices that launched before Android S must still be able to access
debugfs.

Bug: 188022148
Test: build boot
Change-Id: I18ecec3f7daf5a1085de40606640ead63457c4b2
2021-05-13 17:28:27 -07:00
Yifan Hong
7cc63d9d7b Merge "Rectify KMI version." am: c05ef17e31 am: 655e6a2c64 am: 51e07f62db am: 289141549d
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146

Change-Id: Idd3491f40b4eb8e346bcf465562fd179106be1b0
2021-05-13 20:40:02 +00:00
Yifan Hong
289141549d Merge "Rectify KMI version." am: c05ef17e31 am: 655e6a2c64 am: 51e07f62db
Original change: https://android-review.googlesource.com/c/platform/build/+/1706146

Change-Id: If66a79a2dea904e509216bbd8ca80a73a95fa3c3
2021-05-13 20:31:34 +00:00
Chris Wailes
0c650895bc Add dalvik.vm.dexopt.thermal-cutoff system property
Test: Boot
Bug: 165935246
Change-Id: I45a8f8d6c7e99feccacd0bc8897f791571bdd9c9
2021-05-13 10:59:22 -07:00
Yifan Hong
29c1639715 Rectify KMI version.
Test: builds
Bug: 187913647
Bug: 187432172
Change-Id: Ic01c385b3474c78c5ac2da3b1a5a253eb241ed9b
2021-05-12 14:28:19 -07:00
Tim Van Patten
f969faab52 Merge "Remove ro.gfx.angle.supported from base_system.mk" into sc-dev am: 460f6d0b45
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14492987

Change-Id: If2c18359118a2c473f99636b28bd706af25b4736
2021-05-12 17:13:59 +00:00
Tim Van Patten
460f6d0b45 Merge "Remove ro.gfx.angle.supported from base_system.mk" into sc-dev 2021-05-12 16:59:08 +00:00
Treehugger Robot
4d63911370 Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37 am: bde804c8cf am: daab4cb7c6 am: 4ea660a62d
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: Iee54b6fec42694513e3de62e37eb910eadddc004
2021-05-11 14:19:14 +00:00
Treehugger Robot
4ea660a62d Merge "Fix GKI 2.0 signing in the release process" am: 328a537e37 am: bde804c8cf am: daab4cb7c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1699576

Change-Id: I939155566577ae36fd7626a080b2187919458222
2021-05-11 14:08:19 +00:00
Bowgo Tsai
7bcb55b414 Fix GKI 2.0 signing in the release process
In the release signing process, it uses --signing_helper_with_files
for avbtool. This can be done by passing
--gki_signing_signature_args="--signing_helper_with_files=/path/to/helper.sh"
for mkbootimg.

However, this only works when there is a default value of
"gki_signing_signature_args" in the misc_info.txt, to be appended
with more extra args. Adding a default value "--prop foo:bar" to make
it work.

Note: also move the BOARD_GKI_* signing config to
BoardConfigGsiCommon.mk, so we don't have to duplicate the settings
for each architecture.

Bug: 178559811
Bug: 177862434
Test: `make bootimage`
      `unpack_bootimg --boot_img $OUT/boot.img --out unpack`
      `avbtool info_image --image ./unpack/boot_signature`
Change-Id: I8bd8ad3acf324931b47d45fd30bc590206b1927e
2021-05-11 18:10:18 +08:00