Yifan Hong
b041d61e84
Merge "Add health filesystem HAL to VNDK"
2018-08-10 20:11:32 +00:00
Jason Monk
7e06b26b5e
Merge "Adding overrides support to android_app bps"
2018-08-10 19:11:10 +00:00
Roland Levillain
3f3505ca5f
Merge "Revert "Pass public API list to class2greylist tool.""
2018-08-10 18:23:17 +00:00
Roland Levillain
a86b80567a
Revert "Pass public API list to class2greylist tool."
...
This reverts commit 9f46a30e29
.
Reason for revert: This change breaks the ART Buildbot (see
https://build.chromium.org/p/client.art/builders/angler-armv7-ndebug/builds/2045/steps/build%20target/logs/stdio ).
Bug: 110868826
Change-Id: I78efb71738f191b432b271f723ac83e4f02e6a0d
2018-08-10 17:55:07 +00:00
Jason Monk
87eb791c4f
Adding overrides support to android_app bps
...
Test: build
Change-Id: I7910d042c6e7f8ac9c77e294aca11b01713d0fef
2018-08-10 13:38:57 -04:00
Mathew Inwood
edeab211d2
Merge "Pass public API list to class2greylist tool."
2018-08-10 15:21:35 +00:00
Yifan Hong
fb2a43f5ad
Add health filesystem HAL to VNDK
...
Test: builds
Bug: 111655771
Change-Id: Ib8e3f34f0d97a99de62bd00162af993305a1d89e
Merged-In: Ib8e3f34f0d97a99de62bd00162af993305a1d89e
2018-08-09 17:09:28 -07:00
Colin Cross
18eeb98faa
Merge "Add soong_droiddoc_prebuilt.mk"
2018-08-09 20:19:32 +00:00
Colin Cross
521b22cf66
Add soong_droiddoc_prebuilt.mk
...
Soong droiddoc modules were using soong_java_prebuilt.mk, but they
don't need any of the java logic from it, and it includes
base_rules.mk which was not included by droiddoc.mk. Add
soong_droiddoc_prebuilt.mk that just installs the droiddoc
outputs without including base_rules.mk.
Fixes building docs modules in mm, mma, and m checkbuild.
Bug: 112388925
Test: m docs
Change-Id: I4f7262e2c3b1afbee44c1cc306330885b687a074
2018-08-09 11:24:11 -07:00
Mathew Inwood
9f46a30e29
Pass public API list to class2greylist tool.
...
This is necessary to allow it to exclude synthetic bridge methods from the
generated greylist. We need to be able to apply the @UnsupportedAppUsage
annotation to regular (non-bridged) methods, but due to the SDK visibility
rules, the synthetic bridge is part of the SDK.
Bug: 110868826
Test: m
Change-Id: Iac23b0d2a9b371771a020b24191634a8b6b9b4b5
2018-08-09 11:14:10 +01:00
Tao Bao
35edeae74f
Merge "Revert "Whitelist system/lib64/libminadbd_services.so for recovery image.""
2018-08-08 16:36:20 +00:00
Bowgo Tsai
d624fa63d5
Add support for /odm partition
...
This CL is largely an adaptation of Change-Id
I5d229f6ac729ea6df9ff1f14cee2e28972cd9b4d
tools/vendor_buildinfo.sh is also renamed to tools/device_buildinfo.sh.
The caller then can invoke device_buildinfo.sh "vendor" | "odm" to
generate properties for vendor.img and odm.img, respectively.
It adds the following variables:
- BOARD_AVB_ODM_KEY_PATH
- BOARD_AVB_ODM_ALGORITHM
- BOARD_AVB_ODM_ROLLBACK_INDEX_LOCATION
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
- BOARD_ODMIMAGE_EXTFS_INODE_COUNT
- BOARD_ODMIMAGE_EXTFS_RSV_PCT
- BOARD_ODMIMAGE_PARTITION_SIZE
- BOARD_ODMIMAGE_JOURNAL_SIZE
- BOARD_ODMIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR
- BOARD_ODMIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_ODMIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_PREBUILT_ODMIMAGE
- BOARD_USES_ODMIMAGE
- LOCAL_ODM_MODULE
- PRODUCT_ODM_BASE_FS_PATH
- PRODUCT_ODM_VERITY_PARTITION
- PRODUCT_ODM_PROPERTIES
- TARGET_COPY_OUT_ODM
- TARGET_OUT_ODM
- TARGET_OUT_ODM_*
Bug: 64195575
Test: boot a Taimen with existing images
Test: `make odmimage` with
- BOARD_AVB_ENABLE := true
- BOARD_ODMIMAGE_PARTITION_SIZE := 62914560
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
- TARGET_COPY_OUT_ODM := odm
- PRODUCT_ODM_PROPERTIES += odm.test.build=success
Test: `make odmimage` with
- BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE := 10485760
- BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4
- BOARD_AVB_ENABLE := true
- TARGET_COPY_OUT_ODM := odm
- PRODUCT_ODM_PROPERTIES += odm.test.build=success
- PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
Change-Id: I4dea7b567ec49a766c7a4683decaf81c7e921d55
2018-08-08 18:59:44 +08:00
Orion Hodson
9243997500
Merge "Enable dynamic image size for all generic devices"
2018-08-08 07:52:17 +00:00
SzuWei Lin
d7ae1bc169
Enable dynamic image size for all generic devices
...
We enabled the dynamic image for all generic_* BoardConfig.mk.
If a product makefile which use these BoardConfig.mk, it should
define PRODUCT_USE_DYNAMIC_PARTITION_SIZE to enable dynamic image.
This patch enable PRODUCT_USE_DYNAMIC_PARTITION_SIZE to product
`full` and `mainline_$arch`.
Bug: 71970853
Test: make -j PRODUCT-full-eng dist
Test: make -j PRODUCT-mainline_arm64-userdebug dist
Change-Id: I499b733638165306e3b0512859e205a1b36a9130
2018-08-08 13:52:20 +08:00
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
Nan Zhang
cb0a6881c5
Change dependency name to api-stubs-docs_annotations.zip
...
Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I5d4127d020eaaf58322d4ed69049bedbfe458448
Merged-In: I5d4127d020eaaf58322d4ed69049bedbfe458448
2018-08-07 16:07:59 -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
Christopher Ferris
e027dd4aef
Remove micro_bench.
...
micro_bench has been deprecated, so remove it from the list of executables
to be built by default.
Bug: 26928775
Test: Builds.
Change-Id: I701b3077ec00c7e75145aeb52463f47bf8ff2f09
2018-08-07 19:57:56 +00:00
Colin Cross
3ebfe7309f
Remove proguard support
...
R8 is always used now.
Bug: 111885749
Test: m checkbuild
Change-Id: I9ae586c6360f2e3050422090b4e08f27ae167758
2018-08-07 11:22:17 -07:00
Xin Li
e1feef5025
Merge "Merge Android Pie into master"
2018-08-07 16:51:26 +00:00
Morris Lin
a77d5a2dd6
module-info.mk: Output actual module_name.
...
Add actual module_name information to module-info.json, and atest can
get the actual module name instead of module_name with suffix.
Bug: 77288544
Test: make -j8
m out/target/product/generic_x86_64/module-info.json
Change-Id: I1e2dfced10db7ef5d31d26dfeb6a6c50a073a519
2018-08-07 22:17:43 +08: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