Commit graph

78 commits

Author SHA1 Message Date
Xin Li
c2fd58fe67 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie00dbea32e074838466eeed00f316250c2b4f3c2
Change-Id: I9ee3441fd4d063b9dd489cb1b01d3dbc11332457
2020-08-29 01:19:44 -07:00
Steven Moreland
152a619d34 vndservice removed if w/o vndservicemanager
This binary is for talking to vendor services, and it'll hang if
vndservicemanager is not available. On devices where it isn't supported,
just remove it.

Fixes: 165043609
Test: N/A
Change-Id: I908c8771c37deb79cf36efb10e66b7fff7adcedf
2020-08-17 23:59:58 +00:00
Automerger Merge Worker
9b4d9536c0 Merge "Shipping >= API Level 30: no vndservicemanager." am: e05c4c8729 am: 79c12922e4 am: 8a9f40b84e
Change-Id: I2c93f5fc99025aba2c305e259def834b74375b40
2020-02-19 00:32:03 +00:00
Steven Moreland
2bf4726f18 Shipping >= API Level 30: no vndservicemanager.
Make this device configuration instead. Vendor implementations can
choose to use this, but it's not required.

Bug: 148807371
Test: TH will test CF boots
Change-Id: Ic144b1aa36e35295fccd9fa7f7f911587bf39bee
2020-02-14 16:57:08 -08:00
Treehugger Robot
562d15a67d Merge "Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29" 2020-02-07 01:46:41 +00:00
Sundong Ahn
f3cd49787a Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29
The PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 is added. This value is base
module when shipping api level is less than or equal to 29.

Bug: 124531214
Test: m -j
Change-Id: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75
Merged-In: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75
(cherry picked from commit a18f974bd7)
2020-02-06 01:44:03 +00:00
Sundong Ahn
a18f974bd7 Add PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29
The PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 is added. This value is base
module when shipping api level is less than or equal to 29.

Bug: 124531214
Test: m -j
Change-Id: I0f06b04cf4c824b9c975d9b84f4a0e8171acef75
2020-01-17 12:57:12 +09:00
Automerger Merge Worker
1df6d79a0b Merge "device_(manifest|matrix).xml -> vendor_*" am: 2e4f20f540 am: fe1bb53543 am: 9a33bc10bc
Change-Id: I355ece2b39df76de7b82ba65805ea7cf561b7f75
2020-01-16 04:32:31 +00:00
Yifan Hong
51be69f063 device_(manifest|matrix).xml -> vendor_*
Building device_manifest.xml or device_compatibility_matrix.xml only
builds vendor manifest / matrices, but not all device manifest /
matrices (e.g. vintf_fragments, ODM manifest, etc.). Make the name more
accurate.

Test: m check-vintf-all

Change-Id: Ib017507c421355263d53a9e5b357f169c77da36d
2020-01-14 14:24:51 -08:00
Automerger Merge Worker
f175b63dfd Merge "Move group_system_ext and passwd_system_ext to base_system_ext.mk" am: 6e487404ed am: beb44e1d01 am: 2958b05847
Change-Id: I62d8237f2266eb6860121f66827d83a0b63b959a
2019-12-23 11:31:17 +00:00
Justin Yun
cc1e4cfb6e Move group_system_ext and passwd_system_ext to base_system_ext.mk
As we have base_system_ext.mk for the packages in system_ext
partition, move the group and passwd files for system_ext partition
to base_system_ext.mk.

Bug: 141658360
Test: mainline checks pass
Change-Id: Iff50482b90ff9877a58c54c8149014e8c103a3c6
2019-12-23 10:31:54 +09:00
Automerger Merge Worker
9a64a3a6f5 Merge "Do not include linkerconfig for recovery" am: b80f88f424 am: 7fbd89d0de am: 91aaca279e
Change-Id: If4bd264273bb97ec6886d2ae5f25f2cf1818d6ef
2019-12-18 01:28:29 +00:00
Kiyoung Kim
2cf6c27240 Do not include linkerconfig for recovery
Linkerconfig should be built as static, but recovery does not have
enough space for static binary. As recovery linker configuration is
quite static and simple, this can be generated from build time. As a
first step linkerconfig binary should be removed from recovery.

Bug: 146384333
Test: m -j passed && crosshatch recovery worked with this change
Change-Id: Ie82da787424c5d1ddd2724808aa2323ea881f75b
2019-12-17 15:27:02 +09:00
Automerger Merge Worker
b525412cc2 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613 am: b960782c52
Change-Id: I73bbd7ae770d51a75d3c63ed5877d00c4ad3c795
2019-12-13 02:38:23 +00:00
Kiyoung Kim
d7c866cd45 Add linkerconfig to recovery
Add linkerconfig to recovery so it can be executed to generate
ld.config.txt in recovery mode

Bug: 139638519
Test: Tested from crosshatch recovery
Change-Id: I8dd2a8833332c8e583632700d1ba46d9a3b1fc94
2019-12-09 14:59:15 +09:00
Henry Fang
3d86a2cf4c Enable cas@1.2
Turn on cas@1.2 service
Test: Manual
bug: 141783130

Change-Id: I4966dcc83d8ab31223b634987726a0a3f0e706ce
2019-11-06 16:48:28 -08:00
Bill Peckham
e868aec14b Moving recovery resources from /system to /vendor
This change is part of a topic that moves the recovery resources from the
system partition to the vendor partition, if it exists, or the vendor directory
on the system partition otherwise. The recovery resources are moving from the
system image to the vendor partition so that a single system image may be used
with either an A/B or a non-A/B vendor image. The topic removes a delta in the
system image that prevented such reuse in the past.

The recovery resources that are moving are involved with updating the recovery
partition after an update. In a non-A/B configuration, the system boots from
the recovery partition, updates the other partitions (system, vendor, etc.)
Then, the next time the system boots normally, a script updates the recovery
partition (if necessary). This script, the executables it invokes, and the data
files that it uses were previously on the system partition. The resources that
are moving include the following.

* install-recovery.sh
* applypatch
* recovery-resource.dat (if present)
* recovery-from-boot.p (if present)

This change includes the platform build system and release tools changes to
move the recovery resources from system to vendor (or /system/vendor). The
release tools need to know where to generate the recovery patch, and they
discover this from misc_info.txt variable board_uses_vendorimage, which the
platform build system generates.

We remove applypatch from PRODUCT_PACKAGES, but it is added back as a required
module in target/product/base_vendor.mk.

Several release tools rely on the misc_info.txt board_uses_vendorimage variable
to know how to generate and detect the recovery patch.

This change partially removes the --rebuild_recovery flag from the
merge_target_files.py script. The flag will be fully removed in a follow-on
change.

Bug: 68319577
Test: Ensure that recovery partition is updated correctly.
Change-Id: Ia4045bd67ffb3d899efa8d20dab4c4299b87ee5f
2019-10-04 00:04:34 +00:00
Pete Bentley
e28c732521 Install BoringSSL self test binaries to vendor image.
Required in order to run test self test for the vendor copy of
libcrypto.so which may differ from the one in /system and so will use
differently name flag files in order to avoid running the BoringSSL
Known Answer Tests on every process startup, impacting system health.

Bug: 141150335
Test: TH
Change-Id: I1db922379a59fa66fc65b6d92d370f33a2c65799
Merged-In: I1db922379a59fa66fc65b6d92d370f33a2c65799
(cherry picked from commit e3ab8eab25)
2019-09-30 20:38:05 +01:00
Tri Vo
55f2896442 Remove ashmemd and related artifacts
Bug: 139855428
Test: n/a
Change-Id: Ia0dcfc47d4792c7265a884b787a788ab80442a8e
2019-09-24 15:03:22 -07:00
Colin Cross
5ae5da1345 Remove protobuf vendorcompat from base_vendor.mk
It has been added to the individual products that have prebuilts that
reference libprotobuf-cpp-full.so or libprotobuf-cpp-lite.so.

Bug: 117607748
Test: treehugger
Change-Id: I49b79bc0a0b154596158b66cfafebab451c90a95
2019-09-13 16:00:43 -07:00
Colin Cross
4c71549763 Install vendorcompat verison of protobuf
Some prebuilt vendor modules contain references to
libprotobuf-cpp-*.so, but the interface is not stable.  Upgrading
protobuf would cause those modules to fail, so the vendor version
of the new protobuf library is renamed to libprotobuf-cpp-*-3.9.1.so.
Manually install old libprotobuf-cpp-*.so files to /vendor
to avoid breaking products that have prebuilts that reference them.

Once the new version of protobuf is in each product can be
inspected for references to libprotobuf-cpp-*.so on /vendor and
these packages can be included only on those devices that need
them.

Bug: 117607748
Test: m checkbuild
Change-Id: I8ac955eb703e3faf22ff930c59b30385f374ad0a
Merged-In: I8ac955eb703e3faf22ff930c59b30385f374ad0a
2019-09-05 14:42:14 -07:00
Tom Cherry
e3fa048c10 Merge "Add group_system_ext and passwd_system_ext"
am: e6012c8826

Change-Id: Ib8d0e502fba999796cd24fbc6e065fea328547a2
2019-08-21 13:12:40 -07:00
Tom Cherry
9f8d4eba01 Add group_system_ext and passwd_system_ext
Add the remaining group and passwd files for partitions that have
reserved AIDs.

Test: mainline checks pass
Change-Id: Iae62c9465e0144b77b1d804c17fe6e724a744da2
2019-08-21 08:16:16 -07:00
vichang
e611c35c95 Merge "Add com.android.i18n APEX module to PRODUCT_PACKAGES"
am: aa407a85b7

Change-Id: I8fb91f10a91bf1e115c94ec0ab6a74f6ac797d73
2019-08-08 04:24:18 -07:00
Victor Chang
46d95f752b Add com.android.i18n APEX module to PRODUCT_PACKAGES
Bug: 137009149
Test: device boots
Change-Id: I9de4e6930456e52dec76dd2a67d6e7ddad393332
2019-07-26 18:37:22 +01:00
Tom Cherry
6cf1b11ead Generate /etc/{passwd,group} for all partitions
Bug: 73062966
Test: can load AIDs from partitions other than vendor
Test: bionic-unit-tests
Merged-In: Ia85abbeefe5a945369970f2aef42692e07ab8c09
Change-Id: Ia85abbeefe5a945369970f2aef42692e07ab8c09
(cherry picked from commit 8a54ec8482)
2019-07-23 17:07:11 +00:00
Tom Cherry
fb303a5903 Generate /etc/{passwd,group} for all partitions
Bug: 73062966
Test: can load AIDs from partitions other than vendor
Test: bionic-unit-tests
Merged-In: Ia85abbeefe5a945369970f2aef42692e07ab8c09
Change-Id: Ia85abbeefe5a945369970f2aef42692e07ab8c09
2019-07-22 21:41:17 +00:00
Kalesh Singh
b0533c748b Merge "Add ashmemd_hidl_client to base_vendor.mk product packages." am: 6bfa11ed64
am: de28abfbc9

Change-Id: Ia85cc3cac41119b1060d32825300b63202713d9d
2019-06-06 08:35:26 -07:00
Kalesh Singh
d1980fa4e3 Add ashmemd_hidl_client to base_vendor.mk product packages.
Change-Id: I77605e7129d4ffa6026f3546adbda61e59f50de0
Bug: 134161662
Test: m -j
2019-06-04 17:02:48 -07:00
Tao Bao
6f34013ba6 Build otacerts as a module.
Bug: 30414428
Test: `m -j dist` with aosp_taimen-userdebug. Check
      /system/etc/security/otacerts.zip available under system and
      recovery images.
Change-Id: I5abeb2da441fb3e3231e094063c2383eb3807852
Merged-In: I5abeb2da441fb3e3231e094063c2383eb3807852
2019-04-21 14:24:43 -07:00
Tao Bao
4986e81160 Build otacerts as a module.
Bug: 30414428
Test: `m -j dist` with aosp_taimen-userdebug. Check
      /system/etc/security/otacerts.zip available under system and
      recovery images.
Change-Id: I5abeb2da441fb3e3231e094063c2383eb3807852
(cherry picked from commit b7936f3d2e16bcad36dcbfc72123381726dbc3c5)
2019-04-19 21:20:09 +00:00
Tao Bao
22f3f54345 Merge "Include charger.recovery for recovery." am: bc2f9ce2c1 am: f740f57ca8
am: 1efdbad8ea

Change-Id: Id9211411d0234a0a264422a8c426cb251a58cd5b
2019-03-14 10:17:00 -07:00
Tao Bao
bc2f9ce2c1 Merge "Include charger.recovery for recovery." 2019-03-14 16:56:29 +00:00
Dan Willemsen
3d05a08a6f Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
Merged-In: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-06 14:46:06 -08:00
Dan Willemsen
4a70a19f84 Reland "First pass at creating PRODUCT_HOST_PACKAGES"
Adds icu-data_host_runtime_apex to fix unbundled builds which pull it in
via PRODUCT_PACKAGES, but are missing packages that would pull it in via
PRODUCT_HOST_PACKAGES.

Test: build/soong/build_test.bash
Test: in ub-timezonedata-master; tapas TimeZoneData; m
Change-Id: I1583c7582b386c3e8478711cb1df340518d763c1
2019-03-04 18:03:14 -08:00
Tao Bao
2173bc1cf2 Include charger.recovery for recovery.
It used to be installed to recovery with the rsync from normal root to
recovery root.

Bug: 114042635
Test: `m -j bootimage` with aosp_walleye-userdebug.
Change-Id: If3451f21018f271b1df83a31d4ece382e0dfebb9
2019-03-04 11:46:29 -08:00
Sundong Ahn
a1bd079779 Change to configstore 1.1
The configstore 1.2 will be deleted. So changed to configstore 1.1 in
PRODUCT_PACKAGES and remove configstore 1.2 in vndk.

Bug: 124531214
Test: build & boot
Test: adb shell lshal | grep configstore & check configstore 1.2
Change-Id: I2c9e1f8b5dc7616112d2602cac22059a05e59901
2019-02-22 12:06:03 +09:00
Suren Baghdasaryan
b4ceb248c7 Merge "Add cgroups.recovery.json into recovery image" am: e57df508c4 am: 70072e97eb
am: 244ed1f4e3

Change-Id: I8bb86c8f850b96382ff6b94c932a4f13375787df
2019-02-14 10:28:14 -08:00
Suren Baghdasaryan
72546076c8 Add cgroups.recovery.json into recovery image
Use cgroups.recovery.json as /etc/cgroups.json during recovery.

Bug: 124270406
Test: "adb reboot sideload; adb devices" shows 'sideload' as expected
Change-Id: I0af01a6801da7ce29ddd7c30ad48be4f98c3a280
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-14 17:08:55 +00:00
Henry Fang
bce4255f30 enable cas@1.1 interface
Replace default cas@1.0 with cas@1.1
Test: Manual
bug: 123903559

Change-Id: I25e66988581ec6d47dee8790e3ccc32d46cca004
2019-02-05 13:17:03 -08:00
Steven Moreland
67edfd726f Merge "base_vendor += dumpsys_vendor" am: 3a296fde5f am: 23ae5c0c5a
am: 74540d3007

Change-Id: I4a9b3667c60ffed7a1c53a47181a07358b482f9f
2019-01-29 00:27:42 -08:00
Treehugger Robot
3a296fde5f Merge "base_vendor += dumpsys_vendor" 2019-01-29 01:46:08 +00:00
Anton Hansson
a8b60940c5 Merge "Auto-include device_manifest.xml when necessary" am: 096b88bf90 am: 1cff5df789
am: 7c1890f536

Change-Id: I436dc97b1a1b9531017963e98d5b8ccd7cc01b6a
2019-01-28 02:00:22 -08:00
Steven Moreland
442e983241 base_vendor += dumpsys_vendor
Bug: 123433249
Test: adb shell /vendor/bin/dumpsys
Change-Id: I989825c65d759fd07ff0d0f690bc45d056637528
2019-01-25 19:15:20 -08:00
Anton Hansson
d5e069e405 Auto-include device_manifest.xml when necessary
It doesn't make sense to specify a DEVICE_MANIFEST_FILE but the
build not including it. The conditional definition of the module
makes it problematic to have it listed in the PRODUCT_PACKAGES
of a generic mk.

Test: build mainline_arm64 + mainline_system_arm64
Change-Id: I40e435ce114263ceabbd373d3d719318c592fc13
2019-01-25 13:50:47 +00:00
SzuWei Lin
caa5e88d4a Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-16 22:23:35 +08:00
SzuWei Lin
2ccd37eeb3 Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-15 17:37:57 +08:00
Anton Hansson
811f2392c0 Move overridden AOSP modules out of *_system mks
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.

Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
Merged-In: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 10:03:58 +00:00
Anton Hansson
746bcc91cf Move overridden AOSP modules out of *_system mks
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.

Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 09:46:31 +00:00
Tom Cherry
8a03138137 Merge "Separate init packaging for mainline" am: eea8dad05f am: aafccd7aac
am: a71d92f915

Change-Id: Iaadc507dfc6fec5c02b94192afc9b75d4e4762f3
2018-10-16 13:52:25 -07:00