Commit Graph

4096 Commits

Author SHA1 Message Date
Anton Hansson a88a8b6bb1 Merge "Add wrapped net utils to mainline_system."
am: 0820a93d69

Change-Id: I8eeabce2ced5b80205d02db366989650b1191bde
2018-10-01 10:31:42 -07:00
Anton Hansson 0820a93d69 Merge "Add wrapped net utils to mainline_system." 2018-10-01 17:22:05 +00:00
Anton Hansson 5c9730bcc3 Merge "Add bluetooth libraries to mainline_system."
am: e1d2c8d647

Change-Id: Ief3250f164bd57400fc6a0454eda3ab4745f50be
2018-10-01 04:13:58 -07:00
Anton Hansson c941007331 Add bluetooth libraries to mainline_system.
These are included on current mainline devices.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: I1c214c760f3f668804baef642f1c7121d0723bfb
2018-10-01 10:55:35 +00:00
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 58577be60a Merge "Add the nfc_extras shared lib to mainline."
am: 60be6ae961

Change-Id: I23439ac16e7922942861743736797ed7cfe7a8ad
2018-10-01 02:57:14 -07: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 79fec85fde Merge "Add preopt scripts to mainline."
am: cae7ba396c

Change-Id: I5d51193d5135e3ffaf525547917376d2fa45a76c
2018-09-28 04:00:21 -07:00
Anton Hansson cae7ba396c Merge "Add preopt scripts to mainline." 2018-09-28 10:49:00 +00:00
Remi NGUYEN VAN 8654604f4b Merge "Revert "Add libbinderthreadstate to the VNDK.""
am: ebf81b36cf

Change-Id: Ia65b5fc949b046d66da7e437b32e482346a7faac
2018-09-28 02:59:32 -07: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
Wei Wang a595437a4b Merge "Added android.hardware.atrace 1.0 to VNDK"
am: cb1a99a676

Change-Id: Ic6549f55581fcf7d3af6fcb1b83dad5a3cccd552
2018-09-27 18:24:34 -07: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 79a216848b Merge "Add libbinderthreadstate to the VNDK."
am: 2f12a56593

Change-Id: I927a58e0867b47a04fb964a29812cd436e5b4154
2018-09-27 14:14:25 -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
Anton Hansson f6326846e2 Merge "Include AOSP telephony apps in mainline_system."
am: fb59f55487

Change-Id: I928d8c18382cf7c3da4f4200f14b95024b2cbe16
2018-09-27 03:07:16 -07:00
Anton Hansson f7ad92fde1 Merge "Fix vendor include in mainline_arm64."
am: b35140f666

Change-Id: I62ecf429b4ea037d78976f005cc1e5cd5bb68650
2018-09-27 03:06:37 -07: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 93d0e0d3c4 Merge "Add NeuralNetworks HAL v1.2 to VNDK"
am: 4da4d6cc89

Change-Id: I5511f827d6630cb7c48e6e607ed6d006bf8ed9e5
2018-09-24 05:44:09 -07:00
Przemyslaw Szczepaniak 4da4d6cc89 Merge "Add NeuralNetworks HAL v1.2 to VNDK" 2018-09-24 12:25:55 +00:00
Martijn Coenen 0fa999d51c Merge "Add keys for APEX images for eng/userdebug."
am: 6466b3a334

Change-Id: Ibd5efbb12e25309775d6c61bfba3a40d99667c24
2018-09-24 02:57:47 -07: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
Tianjie Xu 09419ba860 Merge "Add recovery-persist to base_system"
am: 4b554bc436

Change-Id: Ic74ff159e437ab5d02d5a5f434fb44b9600800e5
2018-09-20 23:21:59 -07:00
yidong.zhang 62a5929b56 Merge "Enable TARGET_2ND_ARCH_VARIANT := armv7-a for vts build"
am: 993513a7d0

Change-Id: Ic3b9480cd54942a13c8918a66ec22b45db78ed05
2018-09-20 22:55:27 -07:00
Yifan Hong 0672b2222e Merge "health filesystem HAL renamed to health storage HAL"
am: 6a43200f89

Change-Id: If8b9dea76fdebb173cbe01a084080875b31a686b
2018-09-20 22:37:47 -07:00
Hung-ying Tyan 48d9f62e6c Merge changes from topic "vndk28"
am: 5bc52ac49f

Change-Id: I4b1acde427a78f9c49a6d9e5bb2ad6af245de9da
2018-09-20 22:36:57 -07: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 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