Commit Graph

46459 Commits

Author SHA1 Message Date
Tao Bao 7f7d6e3139 Merge "Remove INCLUDE_TEST_OTA_KEYS."
am: 15a7ea1313

Change-Id: I37a43b7f8ed4c86d6a1b54f088626319d659aa6d
2018-09-25 16:43:42 -07:00
Treehugger Robot 15a7ea1313 Merge "Remove INCLUDE_TEST_OTA_KEYS." 2018-09-25 22:58:21 +00:00
Tao Bao 2790154041 Remove INCLUDE_TEST_OTA_KEYS.
This has been long dead since commit
17c83cf22c (2009).

Test: m checkbuild (via TreeHugger)
Test: No hit in code search.
Change-Id: I054241ae63436ade2f4e50ec2fc3757ae35635dd
2018-09-25 12:43:34 -07:00
Yifan Hong b9f8a6fa45 Merge "to-upper and to-lower move to strings.mk"
am: 1f5c41bacf

Change-Id: I560609312c0c64b1412249846e1134e581a4a4a8
2018-09-25 10:51:20 -07:00
Treehugger Robot 1f5c41bacf Merge "to-upper and to-lower move to strings.mk" 2018-09-25 17:38:55 +00:00
Yifan Hong c49bddfb67 to-upper and to-lower move to strings.mk
So that config.mk can use these functions.
Test: builds

Change-Id: I6634226cbed56c34977803ff9c75b8d481c21c34
2018-09-24 14:45:41 -07: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
Chih-Hung Hsieh 4666c24a1e Merge "Strip spaces in my_tidy_flags."
am: f4328b08f6

Change-Id: I5a421511a035f00c006230d1ec26a6f6d482ef75
2018-09-21 14:19:25 -07:00
Treehugger Robot f4328b08f6 Merge "Strip spaces in my_tidy_flags." 2018-09-21 21:02:22 +00:00
Chih-Hung Hsieh 1d9f04ff53 Strip spaces in my_tidy_flags.
Test: make with WITH_TIDY=1 DEFAULT_TIDY_HEADER_DIRS="d1/d2|external/*"
Bug: 32668284
Change-Id: I7443210444d65d7e31b91b312bc518e40167305d
2018-09-21 10:30:31 -07: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 7d041a50b6 Merge "Rename care map in pb format to care_map.pb"
am: 5875ca06ce

Change-Id: I37d563472c1a761ec54673e1ad5817fb2d92699f
2018-09-20 23:29:59 -07: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
Tianjie Xu 5875ca06ce Merge "Rename care map in pb format to care_map.pb" 2018-09-21 00:03:40 +00: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
Treehugger Robot 5bc52ac49f Merge changes from topic "vndk28"
* changes:
  Condition VNDK check on TARGET_BUILD_APPS
  Revert "Revert "Add VNDK v28 to GSI from Android Q""
2018-09-20 06:21:43 +00:00
Dario Freni ea0c204d4f Merge "Pass the intermediate dir to appcompat.sh"
am: abda944667

Change-Id: I5d7c51288fa4cd6739d29db7c2d9261527ce4070
2018-09-19 17:20:01 -07:00
Colin Cross f31d9e78bb Merge "Don't set -pie for windows modules"
am: a70669e4a5

Change-Id: Ifced0ef70db93c0ac1cbf9a046c5badd41df9663
2018-09-19 17:19:28 -07:00
Yifan Hong 091115716b Merge "max size of dynamic partitions for AB devices are halved."
am: 185cce598b

Change-Id: Ie22e87c4a9a7d5a5f8dcea1c46e9225d0e950061
2018-09-19 17:05:37 -07:00
Treehugger Robot abda944667 Merge "Pass the intermediate dir to appcompat.sh" 2018-09-20 00:00:54 +00:00
Colin Cross a70669e4a5 Merge "Don't set -pie for windows modules" 2018-09-20 00:00:42 +00:00
Yifan Hong 185cce598b Merge "max size of dynamic partitions for AB devices are halved." 2018-09-19 23:27:21 +00:00
Dario Freni 75266ab671 Pass the intermediate dir to appcompat.sh
For ASAN build the intermediate dir might differ from the default
directory.

Test: m (on an affected ASAN build)
Bug: 116020783
Change-Id: Ie4f282ea651d710351799f3fc24dba42e79ee63d
2018-09-19 23:18:38 +01:00
Colin Cross feb4a7e4ae Don't set -pie for windows modules
Adding -pie to LOCAL_LDFLAGS for host linking leaves it around
when doing the host cross Windows linking, resulting in a warning:
clang-7: warning: argument unused during compilation: '-pie' [-Wunused-command-line-argument]

Add it later in binary.mk after the flags have been copied to the
single-use my_ldflags.

Bug: 115776263
Test: m checkbuild
Change-Id: I70d71fa1ec6445631dc7e89ef61927a3304375e2
2018-09-19 15:18:17 -07:00
Yifan Hong 10f7310829 max size of dynamic partitions for AB devices are halved.
For example, if BOARD_SUPER_PARTITION_SIZE is
10GiB, then the sum of sizes of all dynamic partitions must
be within 5GiB.
Fixes: 115920069
Test: make

Change-Id: I800faff28e8483c92a1c0cf5e0b3bae4d638f86d
2018-09-19 14:33:14 -07: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
Dan Willemsen a127ddfe6b Merge "Remove *_OUT_INTERMEDIATE_LIBRARIES"
am: c4af7d75dc

Change-Id: Ic661638b5379651cb9b8d566dd82b438358dc6e9
2018-09-19 10:37:33 -07:00
Dan Willemsen c4af7d75dc Merge "Remove *_OUT_INTERMEDIATE_LIBRARIES" 2018-09-19 17:19:37 +00:00
Nan Zhang 88f6c4423c [automerger skipped] Merge "Copy api-versions.xml to out/target/common/obj/PACKAGING"
am: 2a109872f1  -s ours

Change-Id: I8849b9af9eb5f20f3486155b3b9167f9735e4d98
2018-09-19 08:45:21 -07:00
Nan Zhang 2a109872f1 Merge "Copy api-versions.xml to out/target/common/obj/PACKAGING" 2018-09-19 14:34:04 +00:00
Hung-ying Tyan 924d2d929d Condition VNDK check on TARGET_BUILD_APPS
Bug: 113560265
Test: (with the topic)
Test: mv prebuilts/vndk/v28 v28
Test: make TARGET_PRODUCT=aosp_arm TARGET_BUILD_APPS=Launcher3 TARGET_BUILD_VARIANT=userdebug
      --> build pass
Test: lunch aosp_arm-userdebug
      --> error: VNDK version 28 not found
Test: mv v28 prebuilts/vndk/v28
Test: lunch aosp_arm-userdebug
      --> no error
Change-Id: Ifb553a5ee4cec8b3f3b79aebdf824d64571fa817
2018-09-19 18:00:19 +08: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
Nan Zhang bdebeee73f Copy api-versions.xml to out/target/common/obj/PACKAGING
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I77ecc43cd17baf7d7c414bb11e60045724865f43
Merged-In: I77ecc43cd17baf7d7c414bb11e60045724865f43
2018-09-18 23:35:07 -07:00
Nan Zhang d332efd698 Merge commit 'ee16bfa6ca876affd27c07e28fdfb7c67dcd16fb' into stage-aosp-master
Test: m -j api-stubs-docs-jdiff
Change-Id: I927aadd930572365e823f4ae9636773a9820c9c8
2018-09-18 20:41:21 -07:00
Treehugger Robot ee16bfa6ca Merge "Delete apidiff.mk" 2018-09-19 03:02:19 +00:00
TreeHugger Robot 6e0adb27ba Merge "Copy api-versions.xml to out/target/common/obj/PACKAGING" into stage-aosp-master 2018-09-19 00:44:11 +00:00
David Anderson a23e6a0b15 Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition."
am: f63b7f9c6f

Change-Id: I1195c47a1afb44a008afa1bf6953910609239b66
2018-09-18 17:43:04 -07:00
Treehugger Robot f63b7f9c6f Merge "Don't pass --setup_as_rootfs_from_kernel when using a super partition." 2018-09-19 00:34:20 +00:00
David Anderson 8916a2a13c Don't pass --setup_as_rootfs_from_kernel when using a super partition.
When the system partition is a dynamic partition, the device will be
using an initial ramdisk and should not have a root device specified on
the kernel command-line.

Bug: 115939310
Test: device boots when BOARD_SUPER_PARTITION_PARTITION_LIST contains
      super and AVB is enabled.

Change-Id: I5c4b2304bf1ab6a59443c43c354845bf8a3949f0
2018-09-18 15:53:40 -07:00