Commit graph

38 commits

Author SHA1 Message Date
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
Tom Cherry
6195b3578a Separate init packaging for mainline
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
2018-10-16 09:58:54 -07:00
Peiyong Lin
6779fc828b Merge "Update to android.hardware.configstore@1.2." 2018-08-22 16:15:08 +00:00
Treehugger Robot
6518cbdadf Merge "Correct PRODUCT_USE_FASTBOOTD USAGE" 2018-08-17 19:07:17 +00:00
Hridya Valsaraju
e06e97464c Correct PRODUCT_USE_FASTBOOTD USAGE
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)
2018-08-17 11:40:06 -07:00
TreeHugger Robot
7885c61b56 Merge "Correct PRODUCT_USE_FASTBOOTD USAGE" 2018-08-17 04:45:57 +00:00
Hridya Valsaraju
b9d535356b Correct PRODUCT_USE_FASTBOOTD USAGE
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
2018-08-16 10:45:05 -07:00
Anton Hansson
b8a6a476c6 Add init_second_stage.recovery to base modules.
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
2018-08-15 08:52:12 +01:00
Yifan Hong
4684cfbb32 Merge "Add health HAL to recovery." 2018-08-14 21:06:58 +00:00
Hridya Valsaraju
06cf5dcce0 Allow boot control HAL to be used in recovery
Bug: 78793464
Test: make boot image and check if HAL is present in recovery

Change-Id: I380220c9bd716062f58e4d675d6a5f7b9460b093
2018-08-13 22:51:29 -07:00
Yifan Hong
51a4613728 Add health HAL to recovery.
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
2018-08-13 14:58:57 -07:00
Tom Cherry
75308bc5b9 Merge "Include watchdogd where init is included"
am: 1a8473c8de

Change-Id: I3dac363bdf5f785e277c72f33cfca7a966b5b8f1
2018-08-03 12:37:58 -07:00
Tom Cherry
3bb4cd6af2 Include watchdogd where init is included
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
2018-08-02 15:40:44 -07:00
Peiyong Lin
0d6c4bc1a0 Update to android.hardware.configstore@1.2.
BUG: 111505327
Test: Build, flash and verify display test.
Change-Id: Ib83fad3d212b4a7b114699f0b0b726c6ee696eb0
2018-07-24 15:22:50 -07:00
Yifan Hong
8b55abd98f Merge "move device_manifest.xml to base_vendor.mk"
am: bc15d75e5c

Change-Id: I9d6a6164cc19f6d1059373907010ace556784a8c
2018-07-12 21:14:41 -07:00
Yifan Hong
45812e5dbe Fix inconsistency in base_vendor.mk
Test: none
Change-Id: Ia980c42b3bae42d25f993194f10e3b24d5bf102b
2018-07-12 18:29:18 +00:00
Yifan Hong
17d4bcb83a move device_manifest.xml to base_vendor.mk
Test: make
Change-Id: I500269591065569f3102d025b222517dfd4e2c84
2018-07-12 11:23:52 -07:00
Anton Hansson
b02bda26bd Merge "Move packages from base_system to base_vendor." 2018-07-10 06:27:30 +00:00
Anton Hansson
60389468a7 Merge "Move packages from base_system to base_vendor." into stage-aosp-master 2018-07-10 05:59:38 +00:00
Anton Hansson
52a23cfbb3 Move packages from base_system to base_vendor.
These install on the vendor partition. Clean up the whitelist.

Bug: 80410283
Test: lunch mainline_arm64; m nothing

Change-Id: I45df64e1fa060ea98534351140678589afe2e340
Merged-In: I45df64e1fa060ea98534351140678589afe2e340
2018-07-03 12:42:21 +01:00
Anton Hansson
8999411ab1 Move packages from base_system to base_vendor.
These install on the vendor partition. Clean up the whitelist.

Bug: 80410283
Test: lunch mainline_arm64; m nothing

Change-Id: I45df64e1fa060ea98534351140678589afe2e340
2018-07-03 12:37:53 +01:00
Anton Hansson
56ce36f1b2 Include partition-split selinux_policy modules.
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
2018-07-02 17:05:09 +01:00
Anton Hansson
ce5eb452be Include partition-split selinux_policy modules.
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
2018-07-02 14:36:28 +01:00
Anton Hansson
267e989bad Merge "Move some recovery packages out of base_system."
am: 59497d050c

Change-Id: I66d93959982eeb656f6ffffc34be6c30c262b323
2018-06-29 00:14:48 -07:00
Anton Hansson
30417d971e Move some recovery packages out of base_system.
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
2018-06-28 17:22:14 +01:00
Anton Hansson
04750bc03a Merge "Split up fs_config_* modules per partition."
am: 4e0ccc4c8a

Change-Id: I82751b7f53a22bdcccb6667dfb17089d296dd43c
2018-06-27 06:07:11 -07:00
Anton Hansson
e85ec84eef Split up fs_config_* modules per partition.
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
2018-06-27 11:15:59 +01:00
Anton Hansson
9b48c52247 Split base.mk into system and vendor parts.
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
2018-06-26 18:19:46 +01:00
Anton Hansson
3a49ed8cbd Split base.mk into system and vendor parts.
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
2018-06-26 18:18:59 +01:00