Commit Graph

7903 Commits

Author SHA1 Message Date
Martin Stjernholm
36644dcedc Merge "Do not complain about unexpected lsdump files when building with prebuilt APEXes." am: ef79a64b34 am: 2cdf485316 am: 5efdf0fa1d am: 29ee48a390
Original change: https://android-review.googlesource.com/c/platform/build/+/1748082

Change-Id: Ifffd3e62cd1c8f1ddf9bb2e4bbed289298ff1247
2021-06-29 13:48:37 +00:00
Martin Stjernholm
5efdf0fa1d Merge "Do not complain about unexpected lsdump files when building with prebuilt APEXes." am: ef79a64b34 am: 2cdf485316
Original change: https://android-review.googlesource.com/c/platform/build/+/1748082

Change-Id: I6b245bd7ddb470ee2f47d1cdef2356695ae0ea3b
2021-06-29 13:16:59 +00:00
SzuWei Lin
0351d9da61 Include kernel-*-allsyms into boot-*-allsyms.img
The patch fixes the boot-*-allsyms.img of gsi_arm64-userdebug to
pack the kernel with allsyms instead of without allsyms.

Bug: 192318869
Test: build gsi_arm64-userdebug; check the kernel in boot-*-allsyms.img
Test: build gsi_x86_64-userdebug; check the kernel in boot-*-allsyms.img
Change-Id: Ic89dbe27e166d57283c7bef574d525863d20e79f
2021-06-29 10:40:48 +00:00
SzuWei Lin
e0e5b6a93f Include kernel-*-allsyms into boot-*-allsyms.img
The patch fixes the boot-*-allsyms.img of gsi_arm64-userdebug to
pack the kernel with allsyms instead of without allsyms.

Bug: 192318869
Test: build gsi_arm64-userdebug; check the kernel in boot-*-allsyms.img
Test: build gsi_x86_64-userdebug; check the kernel in boot-*-allsyms.img
Change-Id: Ic89dbe27e166d57283c7bef574d525863d20e79f
Merged-In: Ic89dbe27e166d57283c7bef574d525863d20e79f
2021-06-29 17:15:29 +08:00
TreeHugger Robot
92f4377c42 Merge "Remove a trailing \" 2021-06-28 15:58:29 +00:00
Martin Stjernholm
28f96414fd Do not complain about unexpected lsdump files when building with
prebuilt APEXes.

Test: m droid SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Change-Id: Ic75e769dce1ec3440407fe8e88973ae7ed25b651
2021-06-28 16:20:53 +01:00
Martin Stjernholm
525823ab95 Do not complain about unexpected lsdump files when building with
prebuilt APEXes.

Cherry-picked from https://r.android.com/1748082.

Test: m droid SOONG_CONFIG_art_module_source_build=false
Bug: 172480615
Change-Id: Ic75e769dce1ec3440407fe8e88973ae7ed25b651
Merged-In: Ic75e769dce1ec3440407fe8e88973ae7ed25b651
2021-06-28 15:58:45 +01:00
Neil Fuller
5ee2173c05 Remove com.android.geotz jar from system server
This commit removes the com.android.geotz apex from the build.

This apex is associated with the "offline" location time zone provider
from the nascent com.android.geotz module, which has been configured as
the "secondary" provider. This module will not to be updatable in S so
needs to be removed before release.

This is effectively a revert of commit
6009a0a38f.

Bug: 178169250
Bug: 172546738
Test: treehugger
Change-Id: I734388383030984d5c3e7a1373a77da013a6cb8e
2021-06-28 14:04:54 +00:00
Neil Fuller
d04a6c0110 Remove a trailing \
Remove a trailing \ from a line. The character is not strictly necessary
and it currently differs between sc-dev and master, which makes the
removal of the line in sc-dev conflict in the automerger. It's easiest
to fix the line to be the same in master than it is to cherry-pick /
land the topic in master.

Bug: 178169250
Test: treehugger only
Change-Id: I9b5c743d8744c6e9382bcecacfed76f050539eda
2021-06-28 14:59:39 +01:00
Treehugger Robot
bde8858447 Merge "Remove GKI APEX from build." am: bee97a2052 am: e8e08623a2 am: b4681f81d3 am: b0bce2743c
Original change: https://android-review.googlesource.com/c/platform/build/+/1746695

Change-Id: I0d907063aedcfc91fe37d2184134729b0dbf71a2
2021-06-25 01:06:27 +00:00
Treehugger Robot
b4681f81d3 Merge "Remove GKI APEX from build." am: bee97a2052 am: e8e08623a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1746695

Change-Id: I85e4edb8e41d421a8a3856825983c1c225178788
2021-06-25 00:39:17 +00:00
Treehugger Robot
bee97a2052 Merge "Remove GKI APEX from build." 2021-06-25 00:08:51 +00:00
Yifan Hong
b948d59876 Remove GKI APEX from build.
Test: pass
Bug: 191954621
Change-Id: I4150c81fbe2446849608ac8dabee674485ba16c4
2021-06-24 12:11:34 -07:00
TreeHugger Robot
82f700b124 Merge "Add nearby framework jar to art and system config." 2021-06-23 18:00:04 +00:00
Luke Huang
bdb359aef5 Delete com.android.cronet from base_system
No concrete plan to ship Cronet for now

Bug: 188872256
Test: TH
Merged-In: I86f659de4a956a3186f21a5333781b92b71e7c17
Change-Id: Ic3deabca3794d1541668b45e8e63d99a7345adfd
2021-06-23 08:46:46 +00:00
Wei Wang
93fa60bcba Add nearby framework jar to art and system config.
Nearby mailine module is mandatory on T.

Bug: 189355156
Test: flashed a device and verified nearby jar file was present in BOOTCLASSPATH.

Change-Id: I86f7d8e5699bf59651f1809a8b79a4cbaae930a6
2021-06-22 15:14:56 -07:00
TreeHugger Robot
122a00734b Merge "Disable build-time debugfs restrictions on GSI builds" into sc-dev 2021-06-21 04:58:20 +00:00
Hridya Valsaraju
dbc00eb135 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
Merged-In: I583693df5c30d9bab28f76a6c1e4e9db8e5fd89f
2021-06-18 17:50:12 +00:00
Treehugger Robot
b6cf976da8 Merge "android-info.txt: do not output 'board=' if no board_name" am: 65f4412cc8 am: 2c9ae905cb am: 064b7a58fd am: 21f1e853c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1726355

Change-Id: Ic8bb79c6c1dbdde79ddcd8692705b4609b92121b
2021-06-18 08:05:04 +00:00
Treehugger Robot
064b7a58fd Merge "android-info.txt: do not output 'board=' if no board_name" am: 65f4412cc8 am: 2c9ae905cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1726355

Change-Id: Ifc6964f9757822bdb6ec4aa13f0a8735abb4684f
2021-06-18 07:27:41 +00:00
Treehugger Robot
65f4412cc8 Merge "android-info.txt: do not output 'board=' if no board_name" 2021-06-18 06:51:55 +00:00
Treehugger Robot
5cd63036ec Merge "Add libbinder_rpc_unstable to system image" am: 92fb9274d9 am: a3d1f3f4c9 am: 291c17c857 am: 78748bf07c
Original change: https://android-review.googlesource.com/c/platform/build/+/1733992

Change-Id: I3c5cdb6d00cf4407a845afe32e4ff9a4f11e5efe
2021-06-17 22:47:09 +00:00
Treehugger Robot
291c17c857 Merge "Add libbinder_rpc_unstable to system image" am: 92fb9274d9 am: a3d1f3f4c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1733992

Change-Id: I9539aa91e5933482e06f02eff286c4582db21332
2021-06-17 22:13:51 +00:00
Treehugger Robot
92fb9274d9 Merge "Add libbinder_rpc_unstable to system image" 2021-06-17 21:43:55 +00:00
TreeHugger Robot
39f0d0998d Merge "Remove mainline boot.img from GSI targets" into sc-dev am: e77729e02b am: ff39b2eea7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14965951

Change-Id: I39cb746fcc24fee876a3a0ae5a578bc1f4f897a7
2021-06-17 10:50:53 +00:00
TreeHugger Robot
f2a4d4552f Merge "Remove mainline boot.img from GSI targets" into sc-dev am: e77729e02b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14965951

Change-Id: I7549df1f57c7b4ba8cc8c833783c38846f584c6a
2021-06-17 10:38:47 +00:00
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