Commit Graph

3976 Commits

Author SHA1 Message Date
Anton Hansson
2df4bce8b8 Add wrapped net utils to mainline_system.
For /vendor to access net utils.

Test: lunch mainline_arm64; m nothing
Bug: 80410283
Change-Id: I317ed0f70271af6304d71ed669e7d1b17b3e19c0
2018-10-01 11:45:22 +01:00
Anton Hansson
bfa4338842 Add the nfc_extras shared lib to mainline.
Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I5bdc32988ced9c0b93bb54bc8cb88ead7efe4fcb
2018-09-28 15:14:59 +01:00
Anton Hansson
cae7ba396c Merge "Add preopt scripts to mainline." 2018-09-28 10:49:00 +00:00
Remi NGUYEN VAN
ebf81b36cf Merge "Revert "Add libbinderthreadstate to the VNDK."" 2018-09-28 09:42:53 +00:00
Remi NGUYEN VAN
13467f5993 Revert "Add libbinderthreadstate to the VNDK."
This reverts commit e99863d896.

Reason for revert: This breaks framework tests and blocks presubmit

Change-Id: I50be59542c0bc655c310fbd15cc55f3b32947453
2018-09-28 07:50:45 +00:00
Treehugger Robot
cb1a99a676 Merge "Added android.hardware.atrace 1.0 to VNDK" 2018-09-28 01:16:13 +00:00
Wei Wang
ccf68e0231 Added android.hardware.atrace 1.0 to VNDK
Bug: 111098596
Test: atrace/systrace

(cherry picked from commit 70ed2ec2f1)

Change-Id: I68c552591875473ad7c51753ebdc77b986c6a73d
2018-09-27 16:39:24 -07:00
Jayant Chowdhary
2f12a56593 Merge "Add libbinderthreadstate to the VNDK." 2018-09-27 21:02:35 +00:00
Anton Hansson
deec280bbb Add preopt scripts to mainline.
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
2018-09-27 11:18:11 +01:00
Jayant Chowdhary
e99863d896 Add libbinderthreadstate to the VNDK.
Bug: 110364143

Test: make -j64

Change-Id: I28259136fa26ff7aaf73e37862fa4c87397cd763
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-09-26 11:07:29 -07:00
Anton Hansson
889018d3d6 Include AOSP telephony apps in mainline_system.
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
2018-09-26 16:28:13 +01:00
Anton Hansson
1b66873130 Fix vendor include in mainline_arm64.
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
2018-09-26 16:28:06 +01:00
Przemyslaw Szczepaniak
4da4d6cc89 Merge "Add NeuralNetworks HAL v1.2 to VNDK" 2018-09-24 12:25:55 +00:00
Treehugger Robot
6466b3a334 Merge "Add keys for APEX images for eng/userdebug." 2018-09-24 09:44:22 +00:00
Slava Shklyaev
aa244e95ae Add NeuralNetworks HAL v1.2 to VNDK
Bug: 114365802
Test: m check-vndk-list
Change-Id: I367869b5aa231175ad1a96518c6950b131d90b8f
Merged-In: I367869b5aa231175ad1a96518c6950b131d90b8f
(cherry-picked in 0bafe4902b)
2018-09-21 14:44:47 +01:00
Treehugger Robot
4b554bc436 Merge "Add recovery-persist to base_system" 2018-09-20 21:26:53 +00:00
Treehugger Robot
993513a7d0 Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build" 2018-09-20 21:04:23 +00:00
Tianjie Xu
0f68c1386c Add recovery-persist to base_system
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
2018-09-20 12:42:08 -07:00
Yifan Hong
6a43200f89 Merge "health filesystem HAL renamed to health storage HAL" 2018-09-20 17:26:53 +00:00
yidong.zhang
f190daa19b Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build
Vts release package is not compatible with cortext-a7(armv7-a) cores.
Build vts with TARGET_2ND_ARCH_VARIANT := armv7-a instead of armv8-a.

Bug: 116070933
Test: run vts -m VtsHalBaseV1_0TargetTest on cortext-a7 platform
Change-Id: I8089856223bac5129ad807496ad78b2cbfe1cc8a
2018-09-20 15:14:41 +00:00
Martijn Coenen
3508ef69fc Add keys for APEX images for eng/userdebug.
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
2018-09-20 06:48:51 +00:00
Yifan Hong
9596c71bc6 health filesystem HAL renamed to health storage HAL
Bug: 111655771
Test: compiles
Change-Id: Ia245102f7af958b7ee7e811342a63b7325d7482b
Merged-In: Ia245102f7af958b7ee7e811342a63b7325d7482b
2018-09-19 13:11:41 -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
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
Treehugger Robot
5c3907f922 Merge "Add VNDK v28 to GSI from Android Q" 2018-09-17 10:00:54 +00: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
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
Treehugger Robot
d9a58852bd Merge "Enable AVB signing on GSI" 2018-09-11 06:21:21 +00: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
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
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
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
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
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
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