This reverts commit cb6e935db8.
Reason for revert: Increases the system image size beyond the
limit for some targets (e.g. marlin).
Bug: 113373927
Change-Id: Ia609523a60179c32d377d0735049c944464ea0cc
Required by certain ringtones, apparently (though I couldn't find
what actually uses this library).
Bug: 80410283
Test: lunch mainline_arm64; m
Change-Id: I36b5b07156b41c442903d7d07e6b9d9f4abe2345
This is disabled by default, but can be enabled via a
config overlay.
Bug: 116191025
Bug: 80410283
Test: make
Change-Id: Ibfe5d85580ccccc774de166750d91efd74458a8d
Remove apex_debug_key, in favor of apex.test.key which is under
/system/apex and is built with soong.
Bug: 118213152
Test: /system/etc/security/apex/testkey exists
Change-Id: Iaa0facea2d26cadd48783778e8915bc3c560de10
Some libs, such as libandroid_net.so and some other Renderscript related
ones, can't be built in PDK due to missing frameworks/base.
Bug: 118634643
Test: build PDK; build doesn't break due to missing VNDK libs
Change-Id: Ic2bf657d796c2044c3b8f49b2963ca84760d54d1
Locales not in this list will get stripped.
Bug: 80410283
Test: lunch mainline_arm64; m
Change-Id: I90a63e234e2f2ee32da8f9f257248f5ee6354151
Merged-In: I90a63e234e2f2ee32da8f9f257248f5ee6354151
(cherry picked from commit d994b0dc98)
Prevents additions of non-aosp artifacts to these products.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id12a77bd7f4cc9917aecbca76e8a2842d7c77613
The existing 'generic' targets are emulator devices, and targeting
it has the side-effect of including emulator-specific artifacts.
Create a mainline device instead, which is really generic. This also
allows specifying tweaks unsuitable for the emulator.
Include BoardConfigGsiCommon for now, even though it includes a few
things we likely won't want in the future.
Bug: 80410283
Bug: 111538404
Test: lunch mainline_arm64; m
Change-Id: I15e7cb41fcbd3c0592a091ba7a8575ddf10bda71
Let this be defined in the leaves instead. As is it frequently causes
problems where the product inheriting this also inherit another value
of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless
overridden again.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Test: lunch mainline_system_arm64; m nothing
Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16
libvixl-arm and libvixl-arm64 are not used by any vendor libraries, but
only by ART. Removing them from VNDK.
Test: m
Change-Id: I5b83be13cd70fb12581fe561798484a8907022c6
To make the generic_x86_arm bootable.
Third party translabor binary can be added on the resulting
system.img and be tested at least on emulator.
BUG: 117673798
Change-Id: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Merged-In: Iffbcf9217bbedc12ba83a4851e84ecbf299bf8e7
Missed adding this app in I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b.
It is usually added in conjunction with RcsService.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic721d1dcef479a03f4b603bd77a91801ea9dd9ec
With a workaround for preopt files that get installed into an unknown
path. The BoardConfig defines whether the files go in /system_other,
so allow that.
This reverts commit 46bf4b510c.
Test: lunch mainline_arm64-userdebug; m nothing
Change-Id: Ia75670eb6e3730ad0ff17f5b81954b69f6cab22b
With system-as-root, both first and second stage init belong to
system, but without system-as-root, first stage belongs to vendor and
second stage belongs to system. This change references two phony
packages that include the right parts of init for systen and vendor.
Bug: 117606184
Test: mainline builds work properly
Change-Id: I997309655fef28cb1c3d4b3be989c035b5c6488d
These binaries are commonly included in debug builds, so include
them on mainline too.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: If0adfb4795ea82e158a0218d9c16d897012dd8b5
See go/heapprofd for details. This will be used to profile the memory
usage of system services and apps.
See https://b.corp.google.com/issues/111289182#comment2 for system
health approval.
Change-Id: I2cf3af57e22c39c968afc0ca971f1d3862e27fe2
Fixes a bug where system_other/ paths are considered part of
the "system" path.
Test: lunch mainline_arm64; m nothing
Change-Id: Id7aad41ea285f545260289f59e55c251677bdc38
Add ANS to telephony systems
Bug: 114793357
Test: verified it using developer options
Change-Id: Id31be8524934b47345ba95954636822eb59264ac
Merged-In: Id31be8524934b47345ba95954636822eb59264ac
This makes iorapd be built as part of the system image
with a regular 'make' command.
Part of a topic that has 'iorapd' start up by init_rc.
Bug: 72170747
Change-Id: I300bc35f508fbe36bf0f545e20236c718392d571
This reverts commit 13467f5993.
Reason for revert: Dependencies which broke tests due to exclusion from
LOCAL_JNI_SHARED_LIBS have been added.
Change-Id: I4aca69d7bfa12a132b8334deb61ed350b434f5df
These are included on current mainline devices.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I1c214c760f3f668804baef642f1c7121d0723bfb
- LiveWallPapersPicker is included virtually everywhere
- PartnerBookmarksProvider is required by other apps
- SafetyRegulatoryInfo shows html content from a res overlay
- DMService, RcsService and Stk are all telephony apps
of some sort.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I5afabc7dcc4ca320f06fdc4a2669fb1b81e53b0b
This reverts commit e99863d896.
Reason for revert: This breaks framework tests and blocks presubmit
Change-Id: I50be59542c0bc655c310fbd15cc55f3b32947453
These scripts support art preopting in system_other, which is
a generically useful thing to keep on mainline.
Note that the preloads_copy script should also be added, but
that needs some work to be done (b/116714695).
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I693e17ac0f61f2417ced639d1fdfe164c54341a9
These apps are included on all mainline devices. Including them
necessitates splitting telephony.mk into two pieces, as "rild"
installs on /vendor.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Id4f1684604c71e853c8096e9a6992e65b6dfefed
Include all the _vendor equivalents of the mk's included by
mainline_system. The previous include was a typo.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I71cf6509ad67ed28908716356228ef3980823bf6
We moved the recovery metric parsing to the native code, which executes
on the next normal build and stays under the system partition. Also,
the recovery-persist binary needs to be installed on both A/B and
non-A/B devices. Therefore, adds recovery-persist to base_system to
avoid breaking the mainline targets.
Bug: 114278989
Test: build mainline target
Change-Id: I251ef862d9342b0dc308223ee6c48849f098bb1e
These keys will be used to sign and verify APEX modules on
eng/userdebug devices. The keys may still change, but are
added now to unblock apexd development.
The keys were generated as follows:
$ openssl genrsa -out apex_debug_key.pem 4096
$ avbtool extract_public_key --key apex_debug_key.pem --output apex_debug_key
We'll probably need PRODUCT_APEX_KEYS at some point, but we'll wait
with that until we have build support.
Bug: 112684055
Test: /system/etc/security/apex/apex_debug_key found on-device
Change-Id: I5f4b1cb1eb11be6431146aa4297b50205fbc382e
This reverts commit ffdbab3ff3.
Bug: 113560265
Test: (with the topic) build aosp_arm-userdebug and app only with and without vndk 28
Change-Id: I68a74ba5544a262414e777d8f07bc1ea18f24235
This reverts commit 6c4578b64e.
Reason for revert: breaks unbundled app builds that don't have prebuilts/vndk
Bug: 113560265
Change-Id: I7c067fda1a369c67866eb8f327eb61170bb26533
These are left in PRODUCT_PACKAGES so that they can still
be added to the classpaths of legacy targets.
Bug: 77307025
Test: boot Pixel 2
Change-Id: Ib14969291319e03f181b9ea4d40096de095137e7
From Android Q, Legacy GSI (aosp_$arch_a(b)-userdebug) can only
support the devices which upgraded from O or O-MR1.
The normal GSI (aosp_$arch-userdebug) will support the device which
launch from P or Q.
The patch add VNDK v28 to Legacy GSI and normal GSI.
Bug: 113560265
Test: lunch aosp_arm64_ab-userdebug; make -j
Check the folder $OUT/system/lib64/vndk-28 existing
Change-Id: I941d2cd56264fffc3ded338871409594a430dce5
This library is in the NDK, so it needs to be guaranteed to be
installed even thought there are no platform dependencies on it.
Bug: 111445392
Test: it is installed
Change-Id: Iba7b224f0d95c62634a728ce7e178af6d08aa7dc
update_engine applies an OTA, and update_verifier verifies
partitions post boot.
Note that this also adds cacerts_google as it's a required module by
update_engine, so this reduces the disparity between pixel /system
and mainline_system /system by ~100 files.
Bug: 110410711
Bug: 111495787
Test: make
Change-Id: Idd31407bbd5543fe1dd2b52e87894ac501a025df
* changes:
Fix unbundled branch by not having it pick up goldfish dependency
Add emulator audio policy config in /vendor not /system
emulator: factor vendor partition out of emulator.mk
They used to be installed under recovery/root/etc. This CL moves the
files to the new location and creates a symlink from /etc to /system/etc
(done by the rule in system/core/rootdir). This gives similar layout
between normal boot and recovery, and allows installing prebuilt_etc
files with Soong (`recovery_available: true`).
As part of the change, we no longer need the whitelisting rule for
mke2fs.conf.
Bug: 112780007
Test: Build with other changes in the topic (aosp_taimen-userdebug).
Check the generated files under recovery (/etc being a symlink to
/system/etc).
Test: Boot into recovery. Verify basic functionalities (`adb shell` and
`adb sideload`, factory reset).
Test: `build/soong/build_test.bash --dist`
Change-Id: Ibb6dea6f179a339f0c2d0fd8ba05ec0085b79a12
audio_policy_configuration_generic.xml is pushed in /system as the default
configuration (used if the vendor does not provide one in /vendor or /odm)
and for the emulator.
As a result it can be parsed by 2.0 and 4.0 audio HALs. The format
is retro-compatible, but not forward-compatible.
Additionally, the generic config pushed in /system should never be used
as the vendor should always provide a configuration file describing its
target architecture. Thus it should not be part of the GSI.
Those files were originally pushed in /system the emulator
target does not provide its own configuration file.
The emulator should provide config file instead in /vendor instead.
Bug: 78543061
Test: sdk_gphone_x86 and aosp_x86_64 emulator has audio
Test: adb shell cat /vendor/etc/audio_policy_configuration.xml | diff - \
frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml
Change-Id: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Merged-In: Ice43cb4670a82f4e60fcccc58a636d224f240b5a
Signed-off-by: Kevin Rocard <krocard@google.com>
(cherry picked from commit dad3ad6126)
The emulator vendor paritions are better moved out of
emulator.mk into device/generic/goldfish/vendor.mk
so that changes in vendor.mk will just concentrate on
vendor partition.
this cl does not impact real devices, and it does not
even impact emulator images (it does code refactoring only)
BUG: 110030159
Change-Id: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
Merged-In: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
(cherry picked from commit 6676853016)
The name of the runtime library name for the SDK library
android.test.base has changed to android.test.base.impl as it is not
built using java_sdk_library construct where *.impl suffix is
automatically added to the runtime lib.
Bug: 77577799
Test: m -j
Merged-In: I975a42412d3c71f0d7de249c08e715fdfd3eab2c
Change-Id: I975a42412d3c71f0d7de249c08e715fdfd3eab2c
Remove all usage of flag PRODUCT_USE_FASTBOOTD
as it will not be set when these files are processed
by the build system.
Bug: 78793464
Test: make bootimage and check for fastbootd binary in recovery
Change-Id: I371a6d2beddeb54a88281934b54b8c61ead12d4f
Merged-In: I371a6d2beddeb54a88281934b54b8c61ead12d4f
(cherry picked from commit b9d535356b)
apexd is a new daemon responsible for managing APEX packages.
Bug: 112455435
Test: apexd is running
Change-Id: I097495af4a6f7374b4d40da4512e3faf517520a1
These packages were removed from a standard checkout in
I7db6b9fbe13d65e717d99d6ee44dd78c8804b05c, and are unlikely
to be used in any other manifests. They were probably just
left here by mistake. Remove them from the core product mks.
Note that the repositories still exist, but they appear to
be abandoned:
https://android.googlesource.com/platform/packages/wallpapers/
Bug: 111729974
Bug: 80410283
Test: make
Change-Id: I3fb2dad49f4f0dd571f73202747f49fcde0563ff
It was previously being included as a REQUIRED module of
the init module, but including it separately allows
separating the system and recovery artifacts in different
mk files.
Remove the whitelist entries the previous construct
necessitated.
Bug: 112318375
Test: lunch mainline_arm64 && m nothing
Change-Id: I02d9ac73c65ba58bb2acc7b2046b06b58c723ced
Add /system/lib[64]/hw/android.hardware.health@2.0-impl-default.so, so that
it can be used by recovery (instead of static linkage).
Bug: 80132328
Test: is_battery_ok works in recovery
Change-Id: I6eaf86a22bc276338cafdcf395b33e08d2366de5
The target/product/vndk/current.txt file was added in order
to have a global check on what is included in the VNDK. This
for instance adds as an extra check to make sure that a
device-specific module doesn't end up in this global set.
However, because modifying the VNDK is relatively common, this
puts undue burden on the build team to conduct reviews. For that
reason, I'm opening it up with additional reviewers.
Bug: N/A
Test: N/A
Change-Id: I9827260bde8ec757be363fc153b718d9c0b68f25
We enabled the dynamic image for all generic_* BoardConfig.mk.
If a product makefile which use these BoardConfig.mk, it should
define PRODUCT_USE_DYNAMIC_PARTITION_SIZE to enable dynamic image.
This patch enable PRODUCT_USE_DYNAMIC_PARTITION_SIZE to product
`full` and `mainline_$arch`.
Bug: 71970853
Test: make -j PRODUCT-full-eng dist
Test: make -j PRODUCT-mainline_arm64-userdebug dist
Change-Id: I499b733638165306e3b0512859e205a1b36a9130
This reverts commit ba3a54b2c4.
Bug: 112318375
Test: `build/soong/build_test.bash --dist` with the matching recovery CL
in the topic.
Change-Id: I35e27120fd62884cbb18f4af7315cad1be080ffd
micro_bench has been deprecated, so remove it from the list of executables
to be built by default.
Bug: 26928775
Test: Builds.
Change-Id: I701b3077ec00c7e75145aeb52463f47bf8ff2f09
The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.
Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
watchdogd is now separated out from init, so include it where init is
included.
Bug: 73660730
Test: watchdogd is still included on builds
Change-Id: I8208b4bcfd4e2a948744c241b744daf0be3d1381
Not all phones support the VR, so on phones
that don't, the inclusion of vr_hwc is causing
VtsHalGraphicsComposerV2_1Target failures.
Bug: 109913118
Bug: 111963599
Test: vr_hwc is not on aosp_arm64_ab
Change-Id: I803b4dddc5a87e35875992ad9421c644698112f1
Merged-In: I803b4dddc5a87e35875992ad9421c644698112f1
(cherry picked from commit 52971ca09b)
The feature should work fine on the devices with partition _a and _b.
and will not be enabled on the devices without partition _a and _b.
Bug: 110763858
Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug
Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Merged-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
These tools are useful for dumping elf information. Also, some of the
scripts in development are being modified to use some of these tools,
specifically, unwind_symbols.
Test: Do a clean userdebug build and verify that the tools are built.
Change-Id: Id26b8d2220dc542e8aa73d4b701916fa3d2ea804
Merged-In: Id26b8d2220dc542e8aa73d4b701916fa3d2ea804
(cherry picked from commit 6605dc01b4)
The feature should work fine on the devices with partition _a and _b.
and will not be enabled on the devices without partition _a and _b.
Bug: 110763858
Test: build aosp_arm64-userdebug and aosp_arm64_ab-userdebug
Change-Id: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Merged-In: I9f783dd6fe69eff2536a6aac0506e41c724510b2
Prior to this change the product-installed-files macro didn't include
PRODUCT_COPY_FILES, which is a problem for the artifact path
enforcements. Fix this by moving the dep on PCF into main.mk.
Leave the declaration in Makefile for now.
Test: diff modules_to_install before and after
Bug: 80410283
Change-Id: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
Merged-In: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
Prior to this change the product-installed-files macro didn't include
PRODUCT_COPY_FILES, which is a problem for the artifact path
enforcements. Fix this by moving the dep on PCF into main.mk.
Leave the declaration in Makefile for now.
Test: diff modules_to_install before and after
Bug: 80410283
Change-Id: Ie7ecd5a963aedd2c573f4fe46d327829908aec03
Add handheld_system and handheld_vendor makefiles which
together make up generic_no_telephony. Document what belongs
in these files.
Also update mainline_system to inherit handheld_system.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Merged-In: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Add handheld_system and handheld_vendor makefiles which
together make up generic_no_telephony. Document what belongs
in these files.
Also update mainline_system to inherit handheld_system.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Merged-In: Ic2f7b3dcaddc2c86a1187a394aebe8dfd86465ee
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.
Also update mainline_system to inherit media_system.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
Merged-In: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
Add media_system and media_vendor makefiles which
together make up core_minimal. Document what belongs
in these files.
Also update mainline_system to inherit media_system.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I030bb6805bf9ff8971ad2e4ba75fc74ace02124b
Update stale PRODUCT_SYSTEM_SERVER_JARS list since
com.android.location.provider was renamed to
com.android.location.provider.impl.
Added logic to preopt both archs for SDK libs that are also system
server JARS.
Bug: 110780021
Test: manual and verify speed compiled
(cherry picked from commit 4568c2d908)
Merged-In: I34e728444ffda6db3375b638028d54b6ab623209
Change-Id: If0cb68ba4808aa8716099c5447645f4baac63f30
Move a few things up from core_minimal.mk to base_system, and make
a few other editing tweaks in base_system, to align it more closely
with the internal version.
Test: make
Change-Id: I3d0fd22ea1cf94b0d28610cc15e23aca3ddd21c4
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
These are all in base_system.mk
Bug: 80410283
Test: make
Change-Id: I8717f2d9de10cde44458029692b308017ee2164b
Merged-In: I8717f2d9de10cde44458029692b308017ee2164b
Only enable it for the core build files rolling up to generic.mk
for now, and whitelist a couple of modules that are conditionally
defined.
Bug: 7456955
Bug: 80410283
Test: lunch generic; m
Test: lunch full; m
Change-Id: I5448769433d09eaf970c4231874ced3261a5c66b
GSI Pi (for newly launched devices) need to enable this to pass
VtsTrebleSysProp.
Bug: 79395858
Test: Built aosp_{arm,arm64,x86,x86_64}. Check system/etc/prop.default
and found "ro.actionable_compatible_property.enabled=true".
aosp_x86(_64) could boot to home screen.
Change-Id: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
Merged-In: I04a4ff7c5feee7671d727c04c9d9657b63ec0912
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.
Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
Merged-In: I5d8af175a48172e63926e68f39daad4508f37ccb
These were found by comparing PRODUCT_PACKAGES to $(ALL_MODULES). It
will be made an error for the core makefiles to depend on non-existing
modules soon.
Bug: 7456955
Bug: 80410283
Test: make
Test: diff various products before and after
Change-Id: I5d8af175a48172e63926e68f39daad4508f37ccb
These install on the vendor partition. Clean up the whitelist.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I45df64e1fa060ea98534351140678589afe2e340
Merged-In: I45df64e1fa060ea98534351140678589afe2e340
These install on the vendor partition. Clean up the whitelist.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I45df64e1fa060ea98534351140678589afe2e340
The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.
Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.
Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
Merged-In: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
- Missed adding core_64_bit include in the aosp version of
I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2.
- new recovery targets appeared over night, whitelist them for now
Test: make
Change-Id: I2235dcc7a3e62e1b0091e43829c519b03c2455a4
Merged-In: I2235dcc7a3e62e1b0091e43829c519b03c2455a4
So that they are available on device by default.
Test: make
(cherry picked from commit 161db06003)
Merged-In: If3c1513d1c086f965a8adc157a96b35c119962c3
Change-Id: Ifd87294d08a8a7bb074b39b5bd620124e29540ed
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.
- mainline_system: base mk for mainline systemimage. It will evolve to
inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm: variant of mainline_system, specifically for
the 'generic' device.
- mainline_arm: experimental product that also includes the non-system
parts of aosp. Useful to experiment with the mk split.
Bug: 80410283
Test: lunch mainline_arm64 && m nothing && lunch mainline_system_arm64 && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
Merged-In: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.
- mainline_system: base mk for mainline systemimage. It will evolve to
inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm64: variant of mainline_system, specifically for
the 'generic' device.
- mainline_arm64: experimental product that also includes the non-system
parts of aosp. Useful to experiment with the mk split.
Bug: 80410283
Test: lunch mainline_arm && m nothing && lunch mainline_system_arm && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
Put the in base_vendor for now. That file should probably be renamed
to base_nonsystem.mk or something of that sort.
There is a remaining artifacts in recovery, but I think its target
needs to be split up, so move these for now.
Bug: 80410283
Test: make
Change-Id: I98c2b96b413fff4c8b0377e69bc9c2693ccca7cd
This was already done for partitions other than the system partition.
Add new, separate "_system" targets, and add new phony modules which
collects _system and _nonsystem targets for now.
Update the base_system.mk file to only depend on the system module, and
put the other ones in base_vendor.mk for now.
Bug: 80410283
Test: make fs_config_dirs[_*] fs_config_files[_*] and verify output
Change-Id: I7843578dbb9f27edf4c1e5b4a795a530f79e0be1
It's small, and doesn't really have a theme so it doesn't really warrant
its own build file. Inline its contents in all its children.
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I7db95f9134df36ebd0271e21dba1fa13b28afc72
Also remove two nonexistant packages (libnfc_ndef & libvariablespeed).
The moved packages are already being pulled in by being required by
other included packages in one of its parents (base or core_minimal).
These are the moved packages and their pre-existing deps:
- libmdnssd: by netd in base.mk
- libandroidfw: by 7 packages, many in base.mk
- libaudioutils: by 3 packages, e.g libmedia in base.mk
- libpowermanager: by 3 packages, e.g. libaudioflinger in base.mk
- libspeexresampler: by libaudioutils
- libwebrtc_audio_preprocessing: by libaudiopreprocessing in core_minimal.mk
This change makes core_base.mk very small. It will be deleted in a
followup-CL and its contents inlined in its direct children.
Bug: 80410283
Bug: 7456955
Test: make
Change-Id: I1240ec6adc5b9208effd6fc70892dfbd453a1fba
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.
Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
Merged-In: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.
Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
Merged-In: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
vndk-check-list check can't be done for 64-bit only product. Some
VNDK libraries (libstagefright_codec_*) are 32-bit only and thus
not built for 64-bit only product. As a result vndk-check-list always
fails on such device. Suppressing the error until the codec libraries
are built with 64-bit.
Bug: 110429754
Test: m -j on hikey64_only
Change-Id: I240ceee3fd0a778e47904ed44a1964084f354141
check-vndk-list has not been run when VNDK is not enabled (i.e.
BOARD_VNDK_VERSION is unset). This was problematic because there is a
chance that a CL which passed pre-submit tests can fail the post-submit
tests when the targets selected for the pre-submit tests are all without
VNDK enforcement.
In order to prevent the case, check-vndk-list is executed regardless of
whether BOARD_VNDK_VERSION is set or not.
Bug: 110424280
Test: m -j on sailfish
Test: m -j on sailfish fails after adding an arbitrary library to VNDK
Change-Id: Ia7427be2a297940a9e9c9f46cb058245596171c9
There are no descendants of this mk in AOSP. Move the content that was
shared with core_minimal.mk to base.mk (ContactsProvider and
DefaultContainerService)
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit 57000e3c79)
Not used anymore, and it's in pretty bad shape, so delete it.
Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
(cherry picked from commit f65e806618)
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit d0d862d794)
Not used anymore, and it's in pretty bad shape, so delete it.
Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
(cherry picked from commit f65e806618)
Switch to GSI images for arm/arm64 sdk images.
BUG: 79941736
This cl does not impact real device images
Test: make -j110 PRODUCT-sdk_phone_armv7-sdk showcommands dist \
DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk sdk_repo
Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
Merged-In: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
Test: m -j, do envsetup.sh in a clean shell, run atest
Change-Id: I868d24176538397a592d20a4d5082170b91c9ae4
Merged-In: I868d24176538397a592d20a4d5082170b91c9ae4
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
only two children (core_tiny and core_minimal)
Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.
The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.
There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.
Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I2e25032645c87f084f911e14fade16bc802ff457
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.
The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.
There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.
Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.
DownloadProvider
idmap
libneuralnetworks
mdnsd
MediaProvider
Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.
DownloadProvider
idmap
libneuralnetworks
mdnsd
MediaProvider
Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
The com.android.location.provider.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.
Bug:77577799
Test: make -j
Change-Id: Idfbc6b09ca4337795277df8b98c73f6fd5865aff
The dyanmic linker and the linker config script for the recovery mode
(*.recovery variants) are added to PRODUCT_PACKAGES.
Also this removes the mountpoint /system_root from the recovery image as the
recovery image is self-contained and the real system image is mounted at
/mnt/system which is created automatically at runtime.
Bug: 63673171
Test: `adb reboot recovery; adb devices` shows the device ID
Test: Select 'mount /system' in the recovery mode, then `adb shell`.
$ lsof -p `pidof adbd` shows that libm.so, libc.so, etc. are loaded from
the /lib directory.
Change-Id: Ice6c75b0b81bb9be696aaff3e095d87f19278995
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
ContactsProvider
DefaultContainerService
libaudiopreprocessing
libfilterpack_imageproc
libgabi++
libstagefright_soft_aacdec
libstagefright_soft_aacenc
libstagefright_soft_amrdec
libstagefright_soft_amrnbenc
libstagefright_soft_amrwbenc
libstagefright_soft_avcdec
libstagefright_soft_avcenc
libstagefright_soft_flacdec
libstagefright_soft_flacenc
libstagefright_soft_g711dec
libstagefright_soft_gsmdec
libstagefright_soft_hevcdec
libstagefright_soft_mp3dec
libstagefright_soft_mpeg2dec
libstagefright_soft_mpeg4dec
libstagefright_soft_mpeg4enc
libstagefright_soft_opusdec
libstagefright_soft_rawdec
libstagefright_soft_vorbisdec
libstagefright_soft_vpxdec
libstagefright_soft_vpxenc
mdnsd
requestsync
Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
Switch to GSI images for arm/arm64 sdk images.
BUG: 79941736
This cl does not impact real device images
Test: make -j110 PRODUCT-sdk_phone_armv7-sdk showcommands dist \
DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk sdk_repo
Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
The emulator vendor paritions are better moved out of
emulator.mk into device/generic/goldfish/vendor.mk
so that changes in vendor.mk will just concentrate on
vendor partition.
this cl does not impact real devices, and it does not
even impact emulator images (it does code refactoring only)
BUG: 110030159
Change-Id: Ic5778cda8ca6ccf7bc2bc2f9028f801cda970143
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
ContactsProvider
DefaultContainerService
libaudiopreprocessing
libfilterpack_imageproc
libgabi++
libstagefright_soft_aacdec
libstagefright_soft_aacenc
libstagefright_soft_amrdec
libstagefright_soft_amrnbenc
libstagefright_soft_amrwbenc
libstagefright_soft_avcdec
libstagefright_soft_avcenc
libstagefright_soft_flacdec
libstagefright_soft_flacenc
libstagefright_soft_g711dec
libstagefright_soft_gsmdec
libstagefright_soft_hevcdec
libstagefright_soft_mp3dec
libstagefright_soft_mpeg2dec
libstagefright_soft_mpeg4dec
libstagefright_soft_mpeg4enc
libstagefright_soft_opusdec
libstagefright_soft_rawdec
libstagefright_soft_vorbisdec
libstagefright_soft_vpxdec
libstagefright_soft_vpxenc
mdnsd
requestsync
Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
Merged-In: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
These two are the only ones inheriting base.mk, and were largely similar.
This CL moves all the shared stuff up one level into base.mk.
One thing not de-duped yet is the PRODUCT_SYSTEM_SERVER_JARS variable,
as the order of that is significant.
Also sort various lists that were ordered arbitrarily.
Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Iddffd6982df039f5daa8be345de338ba11c63c10
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
Use the VNDK sanpshot that matches the version of the target binder.
Bug: 74362637
Bug: 80450527
Test: m -j vndk_snapshot_package
Change-Id: I7d540654c9554f9d8a1feaec5eb441389d3960cb
Roland Levillain