... to avoid merge conflict of changes from aosp/master.
Bug: N/A
Test: m
Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Change-Id: I08a1911b00076b141aeab9016a29b0200104b308
We can properly annotate java_imports now, so update androidx
java_imports to min_sdk_version 24.
Test: m apex-allowed-deps-check
Merged-In: I2f4dc7585066ac35115bb53bdaefe797ee692b0d
Change-Id: I2f4dc7585066ac35115bb53bdaefe797ee692b0d
sdk_version: "30" implies min_sdk_version "30". Ideally we'd like to
specify a lower min_sdk_version here, but java_import does not support
min_sdk_version at the moment.
Test: m apex-allowed-deps-check
Merged-In: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
Change-Id: I879d2260c4779f4c88c26fe1c5b6b8a93c159e40
libneuralnetworks_shim.so allows vendor service to run
a NNAPI Driver sAIDL service backed by a NNAPI SL Driver.
SL Driver is a shared library with a known stable C API,
that contains vendor driver implementation.
libneuralnetworks_shim.so is part of com.android.neuralnetworks
APEX package.
Test: build image
Bug: 172925288
Change-Id: I899f2f14052d5e2e4be61e3c8cfb1b6dc77ba541
Merged-In: I899f2f14052d5e2e4be61e3c8cfb1b6dc77ba541
crt objects are added with new min_sdk_versions as they are now built
with the correct version numbers. See
aosp/I8c9d0fcea816de8cd1532dac4a47eee4f726c037.
Bug: 183191008
Test: m
Merged-In: I352ec2625a65455a8f3f0d8a234301bdb735cfd3
Merged-In: If66a0da9568159db1128599f66a65b50063888e8
Change-Id: If66a0da9568159db1128599f66a65b50063888e8