Commit graph

46005 commits

Author SHA1 Message Date
Anton Hansson
b7b43c2cd5 Merge "Create a dump-files phony target." 2018-10-01 17:25:11 +00:00
Anton Hansson
0820a93d69 Merge "Add wrapped net utils to mainline_system." 2018-10-01 17:22:05 +00:00
Anton Hansson
6961e53876 Create a dump-files phony target.
This is more convenient than the current always-off conditional,
because it doesn't require changing the build system to dump
the installed files.

Bug: 80410283
Test: m dump-files
Change-Id: I7d395750673aff07d2018ffce8321dd280b94ccf
2018-10-01 16:26:17 +01:00
Anton Hansson
e1d2c8d647 Merge "Add bluetooth libraries to mainline_system." 2018-10-01 10:57:27 +00: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
60be6ae961 Merge "Add the nfc_extras shared lib to mainline." 2018-10-01 09:35:45 +00:00
Tao Bao
c7aa0dbf0d Merge "releasetools: Clean up the use of partition_size." 2018-10-01 04:22:05 +00:00
Treehugger Robot
757345ecb6 Merge "Remove obsolete make settings" 2018-09-29 03:35:34 +00:00
Dan Willemsen
95e91f8e39 Remove obsolete make settings
We turn off the default implicit and suffix rules with
--no_builtin_rules.

DELETE_ON_ERROR has no effect, ninja just keeps track of whether we've
successfully built it or not.

Test: build-aosp_arm.ninja is the same before/after
Change-Id: I2e407d4a12dd3a2af3e923fe3e1a3f7a6e2a463c
2018-09-28 10:27:48 -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
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
Tao Bao
35f4ebc957 releasetools: Clean up the use of partition_size.
Unless using dynamic partitions, `partition_size` should be a fixed
value that equals to the partition size in BoardConfig. It should stay
the same when building an image for that partition. Only the actual
image size that's used to hold the filesystem could be adjusted. This CL
cleans up the uses of `partition_size` and `image_size` to better
reflect such logic.

With dynamic partitions, the only thing that changes is the need to
compute `partition_size` upfront. Once that's done, `partition_size`
should remain unchanged.

Test: `m dist`
Test: `python -m unittest test_add_img_to_target_files`
Test: `python -m unittest test_validate_target_files`
Change-Id: Idedb3e018c95e8f63dc4d9c423be27f30ebb584f
2018-09-27 18:06:59 -07: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
Treehugger Robot
1ac080e9e5 Merge "Pass classpath to d8" 2018-09-27 23:27:45 +00:00
Jayant Chowdhary
2f12a56593 Merge "Add libbinderthreadstate to the VNDK." 2018-09-27 21:02:35 +00:00
Tianjie Xu
75844bd171 Merge "Generates the care_map with fingerprint" 2018-09-27 17:32:33 +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
fb59f55487 Merge "Include AOSP telephony apps in mainline_system." 2018-09-27 09:49:54 +00:00
Anton Hansson
b35140f666 Merge "Fix vendor include in mainline_arm64." 2018-09-27 09:49:28 +00:00
Tianjie Xu
861f413fad Generates the care_map with fingerprint
Reads the fingerprint of a partition from the build props and embeds it
into the care_map. Later, the update_verifier will compare the
fingerprint before it performs the verification.

Bug: 114778109
Test: generate care_map for sailfish and new pixel
Change-Id: I06afa01bf6dd3de4456a08ee7960954facc775fb
2018-09-26 23:35:32 -07:00
Tom Cherry
b6eeba5bab Merge "Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2018-09-26 22:24:54 +00:00
Treehugger Robot
004b9b7b7d Merge "Create an artifact to output module-info and OWNERS files in source code" 2018-09-26 21:37:54 +00:00
Tom Cherry
2929cadb3b Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE
The recovery image already contains a copy of first stage init, so we
can boot unconditionally to the recovery image and instruct first
stage init whether or not to boot to Android or to recovery.  In this
case, we need neither the kernel to mount /system as / nor a separate
partition for recovery, so this change modifies the build scripts to
allow this combination.

Bug: 114062208
Test: Boot pixel from recovery to Android with BOARD_USES_RECOVERY_AS_BOOT
      But without BOARD_BUILD_SYSTEM_ROOT_IMAGE
Change-Id: Icd047afb7f22d2724b3bcaca1aa0c837426dcce7
2018-09-26 20:30:36 +00: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
Matt Wachowski
7e67802381 Merge "Added rules to include verified boot config in zip" 2018-09-26 17:15:11 +00: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
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
Treehugger Robot
1f5c41bacf Merge "to-upper and to-lower move to strings.mk" 2018-09-25 17:38:55 +00:00
Simran Basi
03f5253020 Create an artifact to output module-info and OWNERS files in source code
Bug: 114242886
Test: make dist -j owners
      make dist -j module-info

Change-Id: I6d00928c25e3213a5563e64806e0c04530161581
2018-09-24 16:31:29 -07: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
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
Treehugger Robot
f4328b08f6 Merge "Strip spaces in my_tidy_flags." 2018-09-21 21:02:22 +00:00
Colin Cross
ec17af3364 Pass classpath to d8
d8 requires the full classpath if --min-api requires default method
or try-with-resources desugaring.  Always pass the full classpath,
since it will already have been built to generate the input jar.

Bug: 116243313
Test: m checkbuild
Change-Id: I363b4d3145e23d4eed77455c1897430206f3ac22
2018-09-21 12:36:53 -07: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
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