Commit Graph

46498 Commits

Author SHA1 Message Date
Tao Bao
b2577cdbb9 Merge "releasetools: Clean up the use of partition_size."
am: c7aa0dbf0d

Change-Id: Id4df5dd758b601e55b28ca6501a6ceaf903dfc13
2018-09-30 21:30:33 -07:00
Tao Bao
c7aa0dbf0d Merge "releasetools: Clean up the use of partition_size." 2018-10-01 04:22:05 +00:00
Dan Willemsen
5256407e12 Merge "Remove obsolete make settings"
am: 757345ecb6

Change-Id: I0cfadebe814cb80e28bcdf3e8fe4a0338454ad66
2018-09-28 21:19:47 -07: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
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
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
Colin Cross
5fa79d2afd Merge "Pass classpath to d8"
am: 1ac080e9e5

Change-Id: Ie46d1d978d1ab132ee98f637f91fcf61d745c474
2018-09-27 16:37:48 -07:00
Treehugger Robot
1ac080e9e5 Merge "Pass classpath to d8" 2018-09-27 23:27:45 +00: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
Tianjie Xu
57ba72ec15 Merge "Generates the care_map with fingerprint"
am: 75844bd171

Change-Id: Id8f11972199b48123bd73107a8929a082f761704
2018-09-27 10:43:04 -07: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
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
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
e490e330a0 Merge "Allow BOARD_USES_RECOVERY_AS_BOOT without BOARD_BUILD_SYSTEM_ROOT_IMAGE"
am: b6eeba5bab

Change-Id: Ie75a57cad2f8024b61173da5d5aef0ca726ff9be
2018-09-26 15:35:05 -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
Simran Basi
33724676b9 Merge "Create an artifact to output module-info and OWNERS files in source code"
am: 004b9b7b7d

Change-Id: I3536b4c6268659117237fd3b3001c8a208e841f9
2018-09-26 14:48:44 -07: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
7318443ea1 Merge "Added rules to include verified boot config in zip"
am: 7e67802381

Change-Id: Ibbf4b6bc2f37621ab255123e417b8ea04dd61694
2018-09-26 10:28:21 -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
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
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
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
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