Commit graph

3938 commits

Author SHA1 Message Date
Martijn Coenen
9e913d0fcf Merge "Add apexd to base_system." 2018-08-27 17:24:11 +00:00
Anton Hansson
33611b1173 Add OTA support to mainline_system.
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
2018-08-22 17:48:52 +01:00
Treehugger Robot
8e639205d7 Merge changes from topic "from-pi-gsi"
* 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
2018-08-22 04:14:25 +00:00
Tao Bao
696bb33676 Install recovery etc files to recovery/root/system/etc.
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
2018-08-21 10:30:49 -07:00
Hyunyoung Song
3aa57d8d90 Fix unbundled branch by not having it pick up goldfish dependency
Bug: 110165361

Change-Id: I0824b140fdfee296288c03fd03a3bac7966e9179
Merged-In: I0824b140fdfee296288c03fd03a3bac7966e9179
(cherry picked from commit 16e7004e3f)
2018-08-21 06:55:33 +00:00
Kevin Rocard
b4150586c5 Add emulator audio policy config in /vendor not /system
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)
2018-08-21 06:42:11 +00:00
bohu
ebbdea824f emulator: factor vendor partition out of emulator.mk
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)
2018-08-21 14:40:43 +08: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
Martijn Coenen
520b3f91ed Add apexd to base_system.
apexd is a new daemon responsible for managing APEX packages.

Bug: 112455435
Test: apexd is running
Change-Id: I097495af4a6f7374b4d40da4512e3faf517520a1
2018-08-17 13:50:41 +02:00
Anton Hansson
a43576a0b8 Merge "Remove obsolete wallpapers from core product mks." 2018-08-16 06:49:09 +00:00
Anton Hansson
3d128b88f0 Merge "Add init_second_stage.recovery to base modules." 2018-08-16 06:48:50 +00:00
Tri Vo
0dd056538a Merge "Remove libsuspend from VNDK." 2018-08-15 21:05:31 +00:00
Anton Hansson
ed49241d03 Remove obsolete wallpapers from core product mks.
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
2018-08-15 15:45:52 +01: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
Tri Vo
3639f7fc88 Add android.system.suspend@1.0.so to VNDK-core
Bug: 78888165
Test: n/a
Change-Id: I6d4a6d07996de2d16acc71fe177fca7ef27c640f
Merged-In: I6d4a6d07996de2d16acc71fe177fca7ef27c640f
(cherry picked from commit bdf076a667)
2018-08-14 17:32:55 -07:00
Treehugger Robot
aa47189e1c Merge "Remove default BUILD_BROKEN_DUP_RULES := false" 2018-08-14 23:32:20 +00:00
Treehugger Robot
1c8485b713 Merge "Add power@1.3 to the VNDK." 2018-08-14 22:59:36 +00:00
Tri Vo
d0075655c5 Remove libsuspend from VNDK.
Only platform should ever have access to libsuspend

Test: presubmit
Change-Id: Ib0512a6d1739b698046ff468002cfcc41a7fb097
2018-08-14 15:09:57 -07:00
Treehugger Robot
c76b000acb Merge "Add fastbootd to build targets" 2018-08-14 21:25:50 +00:00
Yifan Hong
4684cfbb32 Merge "Add health HAL to recovery." 2018-08-14 21:06:58 +00:00
Colin Cross
de684e84fb Merge "Remove TARGET_USES_MKE2FS" 2018-08-14 20:55:51 +00:00
Steven Moreland
f8b90b42fb Add power@1.3 to the VNDK.
Bug: 110112323
Test: (sanity) build + boot walleye

Change-Id: Ie1cf3fc95b1a0bd53c8cf015df2af10c74979003
2018-08-14 13:34:32 -07:00
Dan Willemsen
d1f319bc48 Remove default BUILD_BROKEN_DUP_RULES := false
This is now false by default.

Bug: 77611511
Test: build_test on git_master
Change-Id: I37ad52a3846c77da184725e7d6f4daae9f4b7f1c
2018-08-14 13:23:49 -07:00
Treehugger Robot
7f02e5961a Merge "Added IRadio 1.3 to VNDK" 2018-08-14 18:43:46 +00:00
Treehugger Robot
23d924aee3 Merge "Allow boot control HAL to be used in recovery" 2018-08-14 17:53:15 +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
Christopher Ferris
9f7e0cff7f Merge "Remove micro_bench." 2018-08-13 22:11:46 +00: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
Colin Cross
a110579e31 Remove TARGET_USES_MKE2FS
Nothing reads TARGET_USES_MKE2FS any more, mke2fs is always used.
Remove the requirement that TARGET_USES_MKE2FS is set, and remove
the places it is set.

Bug: 112241651
Test: m checkbuild
Change-Id: Ibdca062bbe7dcd19ba8f7ee7f8291ce746b74e65
2018-08-13 17:40:26 +00:00
Hridya Valsaraju
91a7e3194b Add fastbootd to build targets
Bug: 78793464
Test: mmm
Change-Id: I0f7101d2ef948c522f8e4cfd51b91d33b59e1866
2018-08-13 10:16:27 -07:00
Jack Yu
9b11c7970a Added IRadio 1.3 to VNDK
Test: Telephony sanity tests
Bug: 110872637
Change-Id: I263d6292f9bc9c2bbe5bc430cf677a04d5bbd920
2018-08-10 17:16:36 -07:00
Treehugger Robot
5b82034475 Merge "Add additional OWNERS for entries to the VNDK." 2018-08-10 23:42:27 +00:00
Steven Moreland
9c8103317c Add additional OWNERS for entries to the VNDK.
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
2018-08-10 15:15:56 -07:00
Yifan Hong
fb2a43f5ad Add health filesystem HAL to VNDK
Test: builds
Bug: 111655771
Change-Id: Ib8e3f34f0d97a99de62bd00162af993305a1d89e
Merged-In: Ib8e3f34f0d97a99de62bd00162af993305a1d89e
2018-08-09 17:09:28 -07:00
Tao Bao
35edeae74f Merge "Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."" 2018-08-08 16:36:20 +00:00
SzuWei Lin
d7ae1bc169 Enable dynamic image size for all generic devices
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
2018-08-08 13:52:20 +08:00
Tao Bao
453b4ddcc4 Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."
This reverts commit ba3a54b2c4.

Bug: 112318375
Test: `build/soong/build_test.bash --dist` with the matching recovery CL
      in the topic.
Change-Id: I35e27120fd62884cbb18f4af7315cad1be080ffd
2018-08-07 20:50:29 -07:00
Tao Bao
ba3a54b2c4 Whitelist system/lib64/libminadbd_services.so for recovery image.
Bug: 112318375
Test: `build/soong/build_test.bash --dist` passes.
Change-Id: I4abb70ae45e33d944859741f079203807a3c8ea6
2018-08-07 16:49:31 -07:00
Tom Cherry
12542bdd8e Add more whitelisted artifacts for the recovery image
Bug: 112318375
Test: build succeeds
Change-Id: I4d12af2b1744a9b79ee8b79f7d15e9b7940d7305
2018-08-07 13:14:09 -07:00
Christopher Ferris
e027dd4aef Remove micro_bench.
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
2018-08-07 19:57:56 +00:00
TreeHugger Robot
431a392db0 Merge "Enable dyanmic image size for GSI" into stage-aosp-master 2018-08-07 03:36:42 +00:00
Isaac Chen
3085fc0c05 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format"""
am: 451fa13fa6

Change-Id: I655794830ffc687c55f29d700368b9fc7074d23c
2018-08-06 12:10:14 -07:00
Treehugger Robot
451fa13fa6 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" 2018-08-06 18:45:48 +00:00
Isaac Chen
b9b51b1b73 Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""
This reverts commit 132748cb80.

Reason for revert: The e2fsck issue, b/112062612, that caused the
revert of the original CL has been fixed in aosp/725259.

Change-Id: I5c919aedcc5b1c4823f565ea2bbe0e6ea81bc3b0
2018-08-06 02:48:28 +00:00
Tom Cherry
75308bc5b9 Merge "Include watchdogd where init is included"
am: 1a8473c8de

Change-Id: I3dac363bdf5f785e277c72f33cfca7a966b5b8f1
2018-08-03 12:37:58 -07:00
SzuWei Lin
a2da9a3361 Enable dyanmic image size for GSI
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
2018-08-03 14:47:43 +08: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
Colin Cross
9d2fe1b5c7 Merge "Revert "Build GSIs (aosp_$arch products) in sparse format""
am: a2b0e478d3

Change-Id: Ia2191fd7e0653f7f634bf273667aecbdffa5635c
2018-08-01 02:29:23 -07:00
Colin Cross
132748cb80 Revert "Build GSIs (aosp_$arch products) in sparse format"
This reverts commit bc0248f211.

Reason for revert: Triggered preexisting issue with e2fsck and ASAN

Bug: 112062612
Change-Id: I7b52fe539252ab1bb7229d32accb7abd6417f470
2018-08-01 06:26:03 +00:00