Commit Graph

8527 Commits

Author SHA1 Message Date
Hridya Valsaraju
ffcf021b82 Merge "Disable build-time debugfs restrictions on GSI builds" am: 32bd512b9e am: 02e6d3ff74 am: b9d5aafce3 am: eeb499eada
Original change: https://android-review.googlesource.com/c/platform/build/+/1736064

Change-Id: I072c577057176f5d2b355f34fbf1d4110cabf955
2021-06-16 18:39:28 +00:00
Hridya Valsaraju
b9d5aafce3 Merge "Disable build-time debugfs restrictions on GSI builds" am: 32bd512b9e am: 02e6d3ff74
Original change: https://android-review.googlesource.com/c/platform/build/+/1736064

Change-Id: I33ff6103a5c627844d8b9273791d0dd324b6887b
2021-06-16 18:14:31 +00:00
Hridya Valsaraju
32bd512b9e Merge "Disable build-time debugfs restrictions on GSI builds" 2021-06-16 17:38:56 +00:00
SzuWei Lin
870752dfd2 Remove mainline boot.img from GSI targets
Originally, the mainline kernel is for Android12.
The mainline kernel is changing to the next Android version.
We don't need to includes mainline boot.img in GSI targets.

Bug: 191120961
Test: TH and check the built result
Change-Id: Icd7677f362077eb675760d51a8f01c5db8baf7e1
2021-06-15 16:43:46 +08:00
Remi NGUYEN VAN
4ba373fe0f Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev 2021-06-15 02:05:19 +00:00
Hridya Valsaraju
2a2a97afba Disable build-time debugfs restrictions on GSI builds
These restrictions enable macros that disable sepolicy access to debugfs
for unauthorized clients on S-launching devices. However, since the
Android S GSI build must also be fully functional on earlier devices
that could have possibly depended on debugfs, disable the build-time
restrictions on GSI builds.

Bug: 184381659
Test: make
Change-Id: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
2021-06-14 14:32:44 -07:00
Remi NGUYEN VAN
45e403bd2e Use NetworkStack instead of NetworkStackNext
Now that NetworkStack has bumped its target SDK to 31, use it
instead of the development SDK NetworkStackNext binary.

In practice NetworkStack and NetworkStackNext are currently
identical, as "current" is now SDK 31 in S branches, and
NetworkStackNext does not contain any T-specific code yet.

This change should not be merged in development branches downstream of
AOSP.

Bug: 189581241
Test: device boots, has connectivity
Merged-In: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
Change-Id: I990c76da41d56c8756835b5743e1666d1382f796
2021-06-14 07:59:48 +00:00
Victor Hsieh
b2d86af939 Add libbinder_rpc_unstable to system image
Bug: 190547489
Bug: 189947807
Test: m
Change-Id: Ib3b1d10e6f09de54966ab6c02f170b0feef17241
2021-06-10 09:54:11 -07:00
satayev
d56062009a Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: Id867ec12ab546613f63a50d608192ab5134f65bb
(cherry picked from commit 66bb2ab32d)
2021-06-10 12:46:54 +00:00
satayev
6fa5479378 resolve merge conflicts of 7a7b416b81 to sc-dev-plus-aosp
Change-Id: Id867ec12ab546613f63a50d608192ab5134f65bb
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
2021-06-10 12:46:14 +00:00
satayev
66bb2ab32d Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
2021-06-08 15:40:22 +00:00
satayev
af56f2eadc Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
2021-06-08 16:38:33 +01:00
Yifan Hong
ddf9092b29 Add servicedispatcher to PRODUCT_PACKAGES_DEBUG.
Test: pass
Bug: 182914638
Change-Id: I17ac0a5cd8c2d8afad4360947fcf8ca5eac040e2
2021-06-04 12:15:39 -07:00
Mohammad Samiul Islam
0e06c113f0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" into sc-dev 2021-06-03 13:59:28 +00:00
Bowgo Tsai
9346c4e2ad android-info.txt: do not output 'board=' if no board_name
If no board name, output nothing to the android-info.txt.
Currently the output of 'board=' might trigger some parsing error
on some clients.

Bug: 189990989
Test: make out/target/product/generic_arm64/android-info.txt
Change-Id: Ia9aab6c092c07349aa57f0e73f8c69b6e05874c1
2021-06-03 17:54:31 +08:00
Jeff Sharkey
f1573ed0e2 Merge "platform/build/make - S is now 31" into sc-dev am: 83ecfb5073 am: 2ec10e7543 am: f63a8b3822
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14748391

Change-Id: I5a16002bd12edc96e0980a20c7b159b34c90fd94
2021-06-02 20:27:34 +00:00
Jeff Sharkey
2ec10e7543 Merge "platform/build/make - S is now 31" into sc-dev am: 83ecfb5073
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14748391

Change-Id: I68f42fbd7ef09dd357d010ac9a27272696414519
2021-06-02 20:14:08 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Mohammad Islam
3a15abec2d Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" am: dfa58118a6 am: 6429f827a0 am: 598bea3cb0 am: f5399f8615
Original change: https://android-review.googlesource.com/c/platform/build/+/1711014

Change-Id: I35a2c885201d8830f7d7aad0cb0b0af1bec8286d
2021-06-02 11:50:27 +00:00
Mohammad Islam
598bea3cb0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" am: dfa58118a6 am: 6429f827a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1711014

Change-Id: I6950657f908e7ec6f191a10289b5a13502a60d84
2021-06-02 10:54:03 +00:00
Mohammad Islam
dfa58118a6 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" 2021-06-02 10:01:19 +00:00
Michael Butler
63d66d3fe1 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" 2021-05-27 18:05:25 +00:00
Mohammad Islam
4a1240de8a 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
Merged-In: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Test: Manually updated APEX with same version via OTA/adb-remount and observed it was decompressed.
2021-05-26 18:21:36 +01:00
Jiyong Park
32afff1de8 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: Ia82cb4d79ed0aa916e26e2adaa703644fc4c1880
2021-05-26 11:24:02 +00:00
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