When a device uses native bridge, it may be included in the system
image, so overriding by vendor/build.prop is not an option.
Example of overriding can be seen here: ag/15881132
Test: build cf_x86_64_phone-userdebug with native-bridge and launch, observe
1. ro.dalvik.vm.native.bridge=native_bridge.so moved from
vendor/build.prop to system/build.prop
2. the prop is correctly set at runtime
3. translated apps work
Bug: 197153442
Change-Id: I6cd566dd4e0fac181e309cb7f282d086de09075b
There will be no android13-5.4. This CL is to clean up build rules
that refers to the gki-5.4.
Bug: 199807830
Test: lunch aosp_arm64-userdebug
Change-Id: Ia982eb2ee3d1eb64db72c1836e433bcc53e71e3f
GSI includes both flattened and unflattened apex at the same time.
However, a flattend apex is not built if the module is built from
prebuilt binary. So, we enable 'MODULE_BUILD_FROM_SOURCE := true'
to force GSI built all modules from source.
Bug: 194917545
Test: build gsi_gms_arm64-user
Test: check com.google.android.art exists in /system/system_ext/apex/
Change-Id: I89eef3e8d06ec1f9d3245513c2dbbff0777e2c62
The pin_camera flag being false makes some in-market devices
(redfin, bramble, coral, etc.) not pin the camera app by default.
Although a Phenotype flag overrides this value,
the OTA flag delivery can fail and ends up non-ping state.
This change makes sure that the device pins the camera app by default
by removing pinner.pin_camera properties modification from this file.
The current default is to pin the camera. See PinnerServices.java
Note that the camera pinning is still disabled on crosshatch family,
sicne it is known to be prone to the memory shortage.
See device-crosshatch.mk.
Also note that some newer devices already pin by default because
they don't refer this file, although the name implies it might.
Test: On Redfin:
$ vendor/google/tools/flashall -w
$ adb root && adb wait-for-device && adb shell am start -a com.android.setupwizard.FOUR_CORNER_EXIT
$ adb shell dumpsys pinner
Bug: 195035033
Bug: 184897981
Merged-In: I81207d0527f758d4800319a3a3c323919daaf814
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
Orgianlly, init.vndk-*.rc are placed under system_ext/etc/init.
`init` always run all thse .rc files. The patch move these .rc
files to system_ext/etc/gsi to avoid the problem.
Bug: 185457479
Test: build gsi_arm64-userdebug; check the files under system_ext/
Change-Id: Iee67d6e2e872cf3cb1dd1014925ed0249c1e7e2d
The pin_camera flag being false makes some in-market devices
(redfin, bramble, coral, etc.) not pin the camera app by default.
Although a Phenotype flag overrides this value,
the OTA flag delivery can fail and ends up non-ping state.
This change makes sure that the device pins the camera app by default
by removing pinner.pin_camera properties modification from this file.
The current default is to pin the camera. See PinnerServices.java
Note that the camera pinning is still disabled on crosshatch family,
sicne it is known to be prone to the memory shortage.
See device-crosshatch.mk.
Also note that some newer devices already pin by default because
they don't refer this file, although the name implies it might.
Test: On Redfin:
$ vendor/google/tools/flashall -w
$ adb root && adb wait-for-device && adb shell am start -a com.android.setupwizard.FOUR_CORNER_EXIT
$ adb shell dumpsys pinner
Bug: 195035033
Bug: 184897981
Change-Id: I81207d0527f758d4800319a3a3c323919daaf814
This library is required by the StatsD apex and including it here ensures
it's always available for use by the apex.
Bug: 192556458
Bug: 160662406
Test: TH
Change-Id: Ia01964d471e4456c05c77c708dee2e71e0121587
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.
Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
Regardless of an "updatable" property, list all apex jars in the same
variable. This is less confusing for devs and matches the pattern with
PRODUCT_APEX_BOOT_JARS.
Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I3b12f26237636f4271cb000480928b3ce1c2e62f
Merged-In: I3b12f26237636f4271cb000480928b3ce1c2e62f
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
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
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
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.
For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.
Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
Merged-In: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
(cherry picked from commit 81a23fed56)
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.
For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.
Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
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
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
... 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
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
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
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
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
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
No concrete plan to ship Cronet for now
Bug: 188872256
Test: TH
Merged-In: I86f659de4a956a3186f21a5333781b92b71e7c17
Change-Id: Ic3deabca3794d1541668b45e8e63d99a7345adfd
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
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
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
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
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)
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
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
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.
This reverts commit 8685248a99.
Reason for revert: Removing libneuralnetworks_shim.so from Android S
Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
Merged-In: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
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
This reverts commit 8685248a99.
Reason for revert: Removing libneuralnetworks_shim.so from Android S
Bug: 188587379
Test: mma
Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
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
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.
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
Devices that launched before Android S must still be able to access
debugfs.
Bug: 188022148
Test: build boot
Change-Id: I18ecec3f7daf5a1085de40606640ead63457c4b2
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
Remove ro.gfx.angle.supported from base_system.mk as a pre-requisite to
moving ANGLE to the CuttleFish-specific build. This fixes a merge
conflict that prevents the AOSP CL from landing.
Bug: 187342779
Test: make
Change-Id: I5c8b6ea71dbc066e125a072689778fe4dda1a686
Delete 5.10-android12 because it is not frozen yet.
Bug: 185445182
Bug: 186647770
Bug: 187432172
Test: build aosp_cf_arm64_phone-eng
Change-Id: Ic28cd0078ba65f92f6867c6106c1d70f442b7040
At runtime it is now responsibility of derive_classpath to define value
of BOOTCLASSPATH. As we are modularizing BCP configs, the end goal is to
have a following ordering:
- ART APEX jars
- /system jars
- /system_ext jars
- /apex jars from non-updatable apexes
- /apex jars from updatable apexes
Note that /apex configs are sorted alphabetically, however they preserve
relative ordering of the jars exported from individual apexes. For
example, core-oj.jar would come before bouncycastle.jar if ART apex
defines their relative order as such.
To match end goal expectations of the APEX ordering, sort existing list
of PRODUCT_UPDATABLE_BOOT_JARS.
Bug: 180105615
Test: presubmit
Change-Id: I15512c0da79ad94b547325d563dac473c006f9fd
Merged-In: I15512c0da79ad94b547325d563dac473c006f9fd
At runtime it is now responsibility of derive_classpath to define value
of BOOTCLASSPATH. As we are modularizing BCP configs, the end goal is to
have a following ordering:
- ART APEX jars
- /system jars
- /system_ext jars
- /apex jars from non-updatable apexes
- /apex jars from updatable apexes
Note that /apex configs are sorted alphabetically, however they preserve
relative ordering of the jars exported from individual apexes. For
example, core-oj.jar would come before bouncycastle.jar if ART apex
defines their relative order as such.
To match end goal expectations of the APEX ordering, sort existing list
of PRODUCT_UPDATABLE_BOOT_JARS.
Bug: 180105615
Test: presubmit
Change-Id: I15512c0da79ad94b547325d563dac473c006f9fd
The default algorithm is sha1, which shouldn't be used now.
Becaues sha256 is more robust against malicious attacks.
Bug: 187021780
Test: TreeHugger
Change-Id: Ia325f59d09687d6d501d9710cbdd3339d7566c60
