Commit graph

4058 commits

Author SHA1 Message Date
Hung-ying Tyan
48d9f62e6c Merge changes from topic "vndk28"
am: 5bc52ac49f

Change-Id: I4b1acde427a78f9c49a6d9e5bb2ad6af245de9da
2018-09-20 22:36:57 -07:00
Hung-ying Tyan
5f8eb7c553 Revert "Revert "Add VNDK v28 to GSI from Android Q""
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
2018-09-19 17:55:29 +08:00
Colin Cross
329da43849 Merge "Revert "Add VNDK v28 to GSI from Android Q""
am: c70c69e740

Change-Id: Iabd2f1934aa3410f3cf4062e991c82ca8f41980e
2018-09-17 18:18:45 -07:00
Colin Cross
c70c69e740 Merge "Revert "Add VNDK v28 to GSI from Android Q"" 2018-09-18 00:35:01 +00:00
Colin Cross
ffdbab3ff3 Revert "Add VNDK v28 to GSI from Android Q"
This reverts commit 6c4578b64e.

Reason for revert: breaks unbundled app builds that don't have prebuilts/vndk

Bug: 113560265
Change-Id: I7c067fda1a369c67866eb8f327eb61170bb26533
2018-09-17 20:25:21 +00:00
SzuWei Lin
dade85dd47 Merge "Add VNDK v28 to GSI from Android Q"
am: 5c3907f922

Change-Id: Ibcbfd59c0cecbfbed5fc3ac5e9f3dfac89bb72c8
2018-09-17 03:20:43 -07:00
Treehugger Robot
5c3907f922 Merge "Add VNDK v28 to GSI from Android Q" 2018-09-17 10:00:54 +00:00
Steven Moreland
f484673f9e Merge "Remove HIDL libs from PRODUCT_BOOT_JARS."
am: 44199a57da

Change-Id: I4d32f0c8a836c57aef7fcc224a2cc4da6d3da621
2018-09-13 09:26:52 -07:00
Steven Moreland
ccc7ce1050 Remove HIDL libs from PRODUCT_BOOT_JARS.
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
2018-09-12 09:17:01 -07:00
Bowgo Tsai
afb8caeadc Merge "Fix build error for sdk_gphone_x86_64-userdebug"
am: 8596dd8828

Change-Id: Id209bcb1c4f24419980fdbb7dbef6c3c423ce788
2018-09-11 07:42:22 -07:00
Bowgo Tsai
6924b25729 Fix build error for sdk_gphone_x86_64-userdebug
Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix
the build break. This is because we enabled AVB signing in the following
CL. And verified boot metadata will consume the reserved size in current
build system.

  https://android-review.googlesource.com/c/platform/build/+/745691

Bug: None
Test: build sdk_gphone_x86_64-userdebug
Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25
2018-09-11 19:23:14 +08:00
Bowgo Tsai
84452c6876 Merge "Enable AVB signing on GSI"
am: d9a58852bd

Change-Id: I16b4761de19f135265df4df5698f042ee8c47400
2018-09-10 23:37:17 -07:00
Treehugger Robot
d9a58852bd Merge "Enable AVB signing on GSI" 2018-09-11 06:21:21 +00:00
Hridya Valsaraju
e4f206e9ae Merge "Add fastboot HAL to VNDK"
am: 217f0defe9

Change-Id: Iea21c1ded8ec05a574d60cf0524eeb445c3e5747
2018-09-07 19:55:45 -07:00
Treehugger Robot
217f0defe9 Merge "Add fastboot HAL to VNDK" 2018-09-08 02:47:40 +00:00
Hridya Valsaraju
3482c89303 Add fastboot HAL to VNDK
Bug: 79480454
Bug: 78793464
Test: make

Change-Id: Ib9fa4161579d666a3276a1a4193b750b64653760
2018-09-06 21:21:16 -07:00
Sundong Ahn
dbda94f7b3 Merge "Rename to android.test.base.impl"
am: 7d1be8148e

Change-Id: I74755b144b194d1ae405faf306b5486399ca77fa
2018-09-06 18:44:46 -07:00
Treehugger Robot
7d1be8148e Merge "Rename to android.test.base.impl" 2018-09-07 01:01:59 +00:00
Bowgo Tsai
9d28638cfc Enable AVB signing on GSI
In current GSI builds, AVB signing is not allowed.
We should allow signing GSI image, while building a vbmeta.img with
AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (flag 2).

When need to disable AVB, use the vbmeta.img above together with the
GSI. When need enable AVB on GSI, include the GSI public key into the
device-specific vbmeta.img. Note that GSI is a chain partition so the
keys used to sign GSI and vbmeta.img are different.

Bug: 112293933
Test: build aosp_arm64-userdebug, checks flag 2 is set in vbmeta.img
      and there is AVB HASHTREE in system.img
      `avbtool info_image --image $OUT/system.img`
      `avbtool info_image --image $OUT/vbmeta.img`

Change-Id: If1eff317621882994e7dcbf37cd35f5bfa16b69a
2018-09-06 09:41:42 +08:00
Steven Moreland
ee8af2ca95 Merge "Install libbinder_ndk to the system."
am: 5fd1022106

Change-Id: Ie24f1f351f718308c60a1c6e5dcc71a8952fa15d
2018-09-05 18:31:42 -07:00
SzuWei Lin
6c4578b64e Add VNDK v28 to GSI from Android Q
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
2018-09-06 09:25:16 +08:00
Steven Moreland
5fd1022106 Merge "Install libbinder_ndk to the system." 2018-09-06 00:04:38 +00:00
Tri Vo
3a43018e57 Merge "Add android.system.suspend@1.0-service to base_system.mk"
am: 647e32fa09

Change-Id: I72275cc502978789c533df6ccd8678fd436ecb40
2018-08-31 13:29:14 -07:00
Steven Moreland
9d5549675a Install libbinder_ndk to the system.
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
2018-08-29 20:52:48 -07:00
Tri Vo
7a7e441379 Add android.system.suspend@1.0-service to base_system.mk
Bug: 78888165
Test: presubmit
Change-Id: I644ebc0704749dbbb7840563d237736babcb003a
2018-08-29 20:35:13 -07:00
Martijn Coenen
0c5cc9e193 Merge "Add apexd to base_system."
am: 9e913d0fcf

Change-Id: I4280a7cd59935c5f099d23328810f90c9f3361c5
2018-08-27 10:37:07 -07:00
Martijn Coenen
9e913d0fcf Merge "Add apexd to base_system." 2018-08-27 17:24:11 +00:00
Anton Hansson
6cd4df1c5d Merge "Add OTA support to mainline_system."
am: 82182c8233

Change-Id: I5464e0370ca7f6db89f0853a72f31951e021328e
2018-08-22 12:03:40 -07: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
e94e9ead54 Merge "Install recovery etc files to recovery/root/system/etc."
am: c901630789

Change-Id: Iaa969ffce9fc42213ec641774170a1698e820777
2018-08-21 18:13:28 -07: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
Sundong Ahn
73e33eae35 Rename to android.test.base.impl
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
2018-08-20 10:06:17 +09:00
Hridya Valsaraju
067c8911f2 Merge "Correct PRODUCT_USE_FASTBOOTD USAGE"
am: 6518cbdadf

Change-Id: I8256a91cc4103dfec9e9247d38c09e723ad1957b
2018-08-17 12:38:53 -07: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
fd2f9a0781 Merge "Remove obsolete wallpapers from core product mks."
am: a43576a0b8

Change-Id: I3027ff8c294231f25cadd52866f62feb312500b1
2018-08-16 00:21:22 -07:00
Anton Hansson
d91a87d9d7 Merge "Add init_second_stage.recovery to base modules."
am: 3d128b88f0

Change-Id: I89d61021fc38684412b4ccc2bbb0e4cf54927523
2018-08-16 00:09:07 -07: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
ef813b772a Merge "Remove libsuspend from VNDK."
am: 0dd056538a

Change-Id: I79da3b322d08a6d98299b5ca6c3c37d7d797e4c2
2018-08-15 15:27:45 -07: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
1a78230723 Merge "Add android.system.suspend@1.0.so to VNDK-core"
am: b05a4f1ed3

Change-Id: I00d8139a5681d5c00fce6e39aa1eddd53fa0f349
2018-08-14 20:08:01 -07: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