Commit Graph

8527 Commits

Author SHA1 Message Date
satayev
11079b3d3f Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 16:48:13 +00:00
satayev
65e68bb263 Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
Merged-In: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 15:46:53 +01:00
Martijn Coenen
421172ec00 Merge "Revert "*-ndk.so libraries are added to the VNDK set."" 2021-07-19 10:10:18 +00:00
Martijn Coenen
0ee4b09e20 Revert "*-ndk.so libraries are added to the VNDK set."
Revert "Add more target-specific properties"

Revert submission 15310714-remove_ndk_platform

Reason for revert: b/193935495
Reverted Changes:
Ia87b2881e:NDK backends supports both apps and platform
Ia32d82d6e:*-ndk.so libraries are added to the VNDK set.
Ie54b512a6:Add more target-specific properties

Change-Id: I16f1894d7c37fff1c89c9cc168f84fd6054ace31
2021-07-19 08:08:53 +00:00
Treehugger Robot
e95be4c110 Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." am: bcb4776446 am: 73588ab86d am: e5f0b9f66e am: 6935853710
Original change: https://android-review.googlesource.com/c/platform/build/+/1736332

Change-Id: Ifbbfd7df57c2401616d7e3af4113d9e5ca33b78f
2021-07-16 18:34:02 +00:00
Treehugger Robot
e5f0b9f66e Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS." am: bcb4776446 am: 73588ab86d
Original change: https://android-review.googlesource.com/c/platform/build/+/1736332

Change-Id: I903241f6a8186a2470b032b994583968aa1731eb
2021-07-16 17:55:24 +00:00
satayev
09e9471eac Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS.
... but not really: move it back to PRODUCT_BOOT_JARS before the list is
passed to soong. This ensures that core-icu4j remains on the boot image
for system health reasons and maintains the status quo.

core-icu4j is the only APEX jar (aside from ART jars) that is ever meant
to be part of the boot image. This is an implementation detail that most
devs don't and shouldn't care about. Instead, most devs assume that
PRODUCT_UPDATABLE_BOOT_JARS is where all apex jars are meant to go. In
the follow ups, PRODUCT_UPDATABLE_BOOT_JARS would be renamed to
PRODUCT_APEX_BOOT_JARS, regardless of the updatable property.

This also solves the problem where vendors add /system and /system_ext
boot jars to PRODUCT_BOOT_JARS outside of default_art_config.mk and
essentially violate the ordering requirement: all /apex jars come after
/system and /system_ext.

Bug: 191127295
Test: atest CtsClasspathsTestCases derive_classpath_test
Change-Id: Ifdfdd02519a0f5baea45619523f0c1eb8be186bc
2021-07-16 14:50:29 +01:00
Jiyong Park
559c53dc1c *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m

Change-Id: Ia32d82d6e32c367bdf1f92151c7da7408e8bcbfa
2021-07-16 22:32:34 +09:00
Treehugger Robot
c36df83b7c Merge "Including debug ramdisk files in base_vendor.mk" am: 187a693129 am: fc0a872d68 am: 1451019f92 am: bb4fa1292a
Original change: https://android-review.googlesource.com/c/platform/build/+/1765532

Change-Id: Iee17be67d0fbb0db8b0f12b3851560c5cddddd75
2021-07-15 09:51:29 +00:00
Treehugger Robot
1451019f92 Merge "Including debug ramdisk files in base_vendor.mk" am: 187a693129 am: fc0a872d68
Original change: https://android-review.googlesource.com/c/platform/build/+/1765532

Change-Id: I303c342605ed94c58c93939c4845f03d0fe6c321
2021-07-15 09:29:40 +00:00
Brett Chabot
c8dbfb795f Port sdk_slim_x86_64 from rvc-emu-dev.
This 'slim' target produces a system image optimized for
headless automated testing on the emulator.

Bug: 193713572
Test: lunch sdk_slim_x86_64, m -j, atest CtsUtilTestCases
Change-Id: I599bfab49b574bef63e5bb90a2aa19c86d566293
2021-07-14 23:25:06 +00:00
Bowgo Tsai
7472a1e6f9 Including debug ramdisk files in base_vendor.mk
Debug ramdisk files should exist for all devices.
Adding those debug ramdisk files in the base_vendor.mk.

  * https://source.android.com/compatibility/vts/vts-on-gsi

Bug: 193565271
Test: `lunch aosp_flame-userdebug`, `make bootimage_debug` then
      checks the output under $OUT/debug_ramdisk/.
Test: Performs the same check for `lunch aosp_bramble-userdebug`.
Change-Id: Id32a53da9a3d5b17ffd05449669c6aa17aec0dfa
2021-07-14 16:50:07 +08:00
TreeHugger Robot
69f66460de Merge "Delete com.android.cronet from base_system" into sc-dev 2021-07-02 09:03:40 +00:00
Treehugger Robot
85806ec38f Merge "Adding adb_debug.prop into generic_ramdisk.mk" am: fb36e13147 am: abc9064f63 am: a39c362271 am: 4ffdd026e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1752361

Change-Id: I01770c4832940460308a17f5d6407d04fde7cf90
2021-07-01 13:46:43 +00:00
Treehugger Robot
a39c362271 Merge "Adding adb_debug.prop into generic_ramdisk.mk" am: fb36e13147 am: abc9064f63
Original change: https://android-review.googlesource.com/c/platform/build/+/1752361

Change-Id: I38494dd7233128148deb631eaa4bad0a0239a7b9
2021-07-01 13:18:56 +00:00
Bowgo Tsai
3c77151b46 Adding adb_debug.prop into generic_ramdisk.mk
After commit I59cd149e0021211b8fd59c44b93bbf18dc8637bf, init_first_stage
is no longer installed to the ramdisk when BOARD_USES_RECOVERY_AS_BOOT
is True (see b/190974433 for details and init/Android.mk in that commit).

adb_debug.prop, which is needed for boot-debug.img,
boot-test-harness.img, etc.,will be absent when
BOARD_USES_RECOVERY_AS_BOOT is true, because adb_debug.prop is
only required by the init_first_stage.

Adding adb_debug.prop into generic_ramdisk.mk to include it
unconditionally.

Bug: 192432810
Test: flash boot-debug.img on a user build, check `adb root` works
Change-Id: I234b3430af1b8b09aeb46aef928ca8e16ad452cc
2021-07-01 16:34:29 +08:00
TreeHugger Robot
744d6629d2 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" into sc-dev 2021-06-30 17:16:25 +00:00
Neil Fuller
81240dae1a Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4 am: 27dacbc582 am: 8e72cc3604
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I2b33f908042dde7a9858455613271de7aaa81fdc
2021-06-30 11:39:04 +00:00
Neil Fuller
8e72cc3604 Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4 am: 27dacbc582
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I17e20b07d4afbf840d7360ccd29864f4107efab8
2021-06-30 11:22:09 +00:00
Neil Fuller
98a2c38a40 Merge "Remove com.android.geotz jar from system server" into sc-dev am: 59b80b91a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14112924

Change-Id: I460600631dbfecf51534b454143dfe1aa6c4fdbf
2021-06-30 11:07:02 +00:00
Neil Fuller
59b80b91a4 Merge "Remove com.android.geotz jar from system server" into sc-dev 2021-06-30 10:54:44 +00:00
Treehugger Robot
1871e7e06b Merge "Include kernel-*-allsyms into boot-*-allsyms.img" am: 0427fb4a97 am: 807d80a6e7 am: 86866377f7 am: 0b80ac3833
Original change: https://android-review.googlesource.com/c/platform/build/+/1749896

Change-Id: Id79aefbc79082ddce10a40323ecbee3d06cfa4eb
2021-06-30 09:46:38 +00:00
Treehugger Robot
86866377f7 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" am: 0427fb4a97 am: 807d80a6e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1749896

Change-Id: I5da0d0c23060d5f6a0fcfbfe3fe60e1af73084da
2021-06-30 09:17:59 +00:00
Treehugger Robot
0427fb4a97 Merge "Include kernel-*-allsyms into boot-*-allsyms.img" 2021-06-30 08:49:08 +00:00
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