Commit Graph

45632 Commits

Author SHA1 Message Date
Tao Bao 453b4ddcc4 Revert "Whitelist system/lib64/libminadbd_services.so for recovery image."
This reverts commit ba3a54b2c4.

Bug: 112318375
Test: `build/soong/build_test.bash --dist` with the matching recovery CL
      in the topic.
Change-Id: I35e27120fd62884cbb18f4af7315cad1be080ffd
2018-08-07 20:50:29 -07:00
Treehugger Robot 5a851c6104 Merge "Whitelist system/lib64/libminadbd_services.so for recovery image." 2018-08-08 02:00:35 +00:00
Tao Bao ba3a54b2c4 Whitelist system/lib64/libminadbd_services.so for recovery image.
Bug: 112318375
Test: `build/soong/build_test.bash --dist` passes.
Change-Id: I4abb70ae45e33d944859741f079203807a3c8ea6
2018-08-07 16:49:31 -07:00
Tom Cherry 6a99ae9099 Merge "Add more whitelisted artifacts for the recovery image" 2018-08-07 20:29:30 +00:00
Tom Cherry 12542bdd8e Add more whitelisted artifacts for the recovery image
Bug: 112318375
Test: build succeeds
Change-Id: I4d12af2b1744a9b79ee8b79f7d15e9b7940d7305
2018-08-07 13:14:09 -07:00
Xin Li e1feef5025 Merge "Merge Android Pie into master" 2018-08-07 16:51:26 +00:00
Xin Li 9d167bd9d3 Merge Android Pie into master
Bug: 112104996
Change-Id: I480e20c33df62a374afad6f81ef1154112732a24
2018-08-06 22:45:35 -07:00
SzuWei Lin fa586e8146 [automerger skipped] Merge "Enable dyanmic image size for GSI"
am: 959701f1a8  -s ours

Change-Id: I2d218636e18a9bedb3610e7ef0aed33e39707883
2018-08-06 22:30:27 -07:00
Treehugger Robot 959701f1a8 Merge "Enable dyanmic image size for GSI" 2018-08-07 05:22:50 +00:00
TreeHugger Robot 431a392db0 Merge "Enable dyanmic image size for GSI" into stage-aosp-master 2018-08-07 03:36:42 +00:00
David Brazdil 0dcaf387cc Merge "Make ART engs owners of core/dex_preopt*.mk"
am: ad57badfdc

Change-Id: Iba09eaf67bebe3cb0c6adb45974900c73f132cd0
2018-08-06 16:16:24 -07:00
David Brazdil ad57badfdc Merge "Make ART engs owners of core/dex_preopt*.mk" 2018-08-06 22:57:20 +00:00
David Brazdil d3c9855a2c Merge "hiddenapi: Split stubs into public/system/test classpaths"
am: 09480aa0cf

Change-Id: I09723c7b797e3359c8e0c6c2cd7d7dc19c0323bb
2018-08-06 15:26:57 -07:00
David Brazdil 09480aa0cf Merge "hiddenapi: Split stubs into public/system/test classpaths" 2018-08-06 21:00:04 +00:00
David Brazdil 671ceafbc7 Make ART engs owners of core/dex_preopt*.mk
Adding ngeoffray@, dbrazdil@, mathewi@ and calin@ to OWNERS for
ART-related makefiles.

Test: N/A
Change-Id: I5952db8336992bd1c32c08bbad85317d0d738d19
2018-08-06 20:49:27 +01:00
Isaac Chen 3085fc0c05 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format"""
am: 451fa13fa6

Change-Id: I655794830ffc687c55f29d700368b9fc7074d23c
2018-08-06 12:10:14 -07:00
nelsonli 66d2f42d40 Merge "Build System: Add variable for copying test config"
am: ef2c15314b

Change-Id: Ib3e1c926d1eb83f35512c76e7a73358bf9495bc6
2018-08-06 12:06:06 -07:00
Treehugger Robot 451fa13fa6 Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" 2018-08-06 18:45:48 +00:00
Tao Bao e0b9cfc6f9 Merge "Write the missing system build props to recovery build prop file."
am: a130af98ed

Change-Id: Ie857cfd750b02d2d36556d495e091b31e55cea73
2018-08-06 10:58:54 -07:00
Treehugger Robot ef2c15314b Merge "Build System: Add variable for copying test config" 2018-08-06 17:58:12 +00:00
Tao Bao a130af98ed Merge "Write the missing system build props to recovery build prop file." 2018-08-06 17:07:57 +00:00
Tao Bao 6eb1a99f36 Write the missing system build props to recovery build prop file.
This was missed by [1], which changed the rules for writing recovery
build prop file.

[1] commit 139c727036

Bug: 110380063
Bug: 112247573
Test: `m bootimage` with aosp_marlin-userdebug. Check the generated
      recovery build prop file against the one before [1].
Change-Id: Ib5829b01a63eee8e8a09486dd68063ba297b7443
2018-08-06 07:36:33 -07:00
Isaac Chen b9b51b1b73 Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""
This reverts commit 132748cb80.

Reason for revert: The e2fsck issue, b/112062612, that caused the
revert of the original CL has been fixed in aosp/725259.

Change-Id: I5c919aedcc5b1c4823f565ea2bbe0e6ea81bc3b0
2018-08-06 02:48:28 +00:00
Neil Fuller 4f2051b1bb Merge "Make host targets use non-repackaged targets"
am: 09c81c303a

Change-Id: I5606474b66c13dba18987163e7ff0dc184f3f497
2018-08-05 08:12:39 -07:00
Treehugger Robot 09c81c303a Merge "Make host targets use non-repackaged targets" 2018-08-05 15:05:48 +00:00
nelsonli 9009311630 Build System: Add variable for copying test config
If LOCAL_TEST_CONFIG is set, it will be the default test config
and ignore the local AndroidTest.xml.

BUG: 110982517
Test: vi art/tools/ahat/Android.mk
      set LOCAL_TEST_CONFIG := ahat_test.xml
      add ahat_test.xml in local
      m -j ahat;
      Then, out/host/linux-x86/testcases/ahat/ahat.config
      and ahat_test.xml should be the same.

Change-Id: I2f4ef735fca7d523bb637a18075512bdebf9826f
2018-08-05 01:35:06 +08:00
Isaac Chen 13d3426f3c Merge "Work around e2fsck issue for building sparse GSIs"
am: a0d3277b8d

Change-Id: I53b45da39145cb10f37bd7bcede55f13cfed801b
2018-08-03 17:07:18 -07:00
Treehugger Robot a0d3277b8d Merge "Work around e2fsck issue for building sparse GSIs" 2018-08-03 23:29:33 +00:00
Tao Bao 0324a550a2 Merge "Write custom recovery UI vars as recovery build prop."
am: d80175db9a

Change-Id: I245e53a27e11e0b096a7d6ee85608e3f30cf7c86
2018-08-03 16:02:55 -07:00
Tao Bao d80175db9a Merge "Write custom recovery UI vars as recovery build prop." 2018-08-03 21:51:20 +00:00
Tom Cherry 75308bc5b9 Merge "Include watchdogd where init is included"
am: 1a8473c8de

Change-Id: I3dac363bdf5f785e277c72f33cfca7a966b5b8f1
2018-08-03 12:37:58 -07:00
Tom Cherry 1a8473c8de Merge "Include watchdogd where init is included" 2018-08-03 19:28:14 +00:00
David Brazdil 7adbde4cd6 hiddenapi: Split stubs into public/system/test classpaths
The hiddenapi tool needs to build a class hierarchy from API stubs.
These are inconsistent between public, system and test API stubs.
This patch splits stubs into the three corresponding categories
and groups the JARs being passed to hiddenapi.

Test: m appcompat
Bug: 76424618
Change-Id: I3f707070d44f04578bc6148a45f2283bcf060703
2018-08-03 17:02:37 +01:00
SzuWei Lin a2da9a3361 Enable dyanmic image size for GSI
The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.

Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
2018-08-03 14:47:43 +08:00
Isaac Chen ec7fa1cd09 Work around e2fsck issue for building sparse GSIs
When trying to support sparse format for GSIs, aosp/720949, a bug in
e2fsck was triggered, and hence failed the build for sparse GSI.

This workaround disables the detection of ASAN ODR so we can build
sparse GSIs successfully like we previously did for the vendors,
some of which can't handle unsparse images.

Bug: 112062612
Test: $ lunch aosp_x86_64-eng
      $ m SANITIZE_HOST=address ASAN_OPTIONS=detect_odr_violation=0 -j
      $ emulator

Change-Id: Ifafd27aa1e57d785b914f78a4d9bfef6a0c33fc9
2018-08-03 11:51:08 +08:00
Tom Cherry 3bb4cd6af2 Include watchdogd where init is included
watchdogd is now separated out from init, so include it where init is
included.

Bug: 73660730
Test: watchdogd is still included on builds
Change-Id: I8208b4bcfd4e2a948744c241b744daf0be3d1381
2018-08-02 15:40:44 -07:00
Yifan Hong 635887d5ac Merge "target_files: copy to PRODUCT-SERVICES instead"
am: 567df6214f

Change-Id: I95bf48eba07daa2b0f6d5b84c45de9b22f7aac0b
2018-08-02 15:31:56 -07:00
Yifan Hong 567df6214f Merge "target_files: copy to PRODUCT-SERVICES instead" 2018-08-02 21:53:57 +00:00
SzuWei Lin 79bfba055b Enable dyanmic image size for GSI
The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.

Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
2018-08-02 18:10:32 +08:00
Tao Bao 0e0794f4e4 Merge "Add the missing args for building AVB-enabled product-services.img."
am: e9bee37677

Change-Id: I8c940347f92475dcd432493d71243e60d8c61738
2018-08-01 22:55:43 -07:00
Treehugger Robot e9bee37677 Merge "Add the missing args for building AVB-enabled product-services.img." 2018-08-02 05:47:19 +00:00
Bryan Henry a2bf1e5c5c Merge "Fix 2009-01-01 timestamps in releasetools to always be UTC"
am: e118d5bc4a

Change-Id: I12c8cc0664306ba116076b3f6d43e1c01fb9120f
2018-08-01 17:24:41 -07:00
Tao Bao 1ebda8d4d2 Add the missing args for building AVB-enabled product-services.img.
Change-Id: I1a6fddee5512509b43f71a53cd1ad023ceacdb3c
Fixes: 112109844
Test: Set up a target with product-services.img. `m dist`
2018-08-01 17:22:50 -07:00
Bryan Henry e118d5bc4a Merge "Fix 2009-01-01 timestamps in releasetools to always be UTC" 2018-08-02 00:16:06 +00:00
Yifan Hong 4d6b38c47a target_files: copy to PRODUCT-SERVICES instead
The add_img_to_target_files.py script uses upper() to determine
the name of sub-directory under target_files_intermediates. The
name of the image is product-services.img but the sub-directory
name was PRODUCT_SERVICES. Change it to PRODUCT-SERVICES so that
'm dist' works.

Test: m dist
Change-Id: I8cad841c674b5d62c1d803d0383fc3aee14f272a
2018-08-01 16:46:16 -07:00
Yifan Hong d55225f8d6 Merge "Remove USE_LOGICAL_PARTITIONS override"
am: c0213682b3

Change-Id: I75667dfc3596cda7b8b640540f48964081107eb2
2018-08-01 11:40:43 -07:00
Yifan Hong 9a7d525849 Merge "Split PRODUCT_USE_LOGICAL_PARTITIONS into sub-flags."
am: d1c308bf40

Change-Id: I834e75dcfc04af0dd8655027bfc251c3d0162815
2018-08-01 11:39:59 -07:00
Yifan Hong c0213682b3 Merge "Remove USE_LOGICAL_PARTITIONS override" 2018-08-01 18:29:51 +00:00
Yifan Hong a42e5f976d Remove USE_LOGICAL_PARTITIONS override
... so that its requirements does not fallback
on the overridden USE_LOGICAL_PARTITIONS, but
PRODUCT_USE_LOGICAL_PARTITIONS.

Test: m superimage -j
Change-Id: Ib14aaf83cc8bd4336125d503d11c69a60566530e
2018-08-01 18:29:44 +00:00
Yifan Hong d1c308bf40 Merge "Split PRODUCT_USE_LOGICAL_PARTITIONS into sub-flags." 2018-08-01 18:29:29 +00:00