Commit Graph

18402 Commits

Author SHA1 Message Date
Bowgo Tsai
e4e3018bf6 Adding constraints for first shipping API level >= 29
Do not allow setting BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE when
first shipping API level >= 29.

Bug: 112291283
Test: Checks it can cause build error when the condition is met

Change-Id: I3983bea89625f5ece303432b32bea277aee21a2b
2018-08-14 00:17:50 +08:00
Mathew Inwood
c4d57494b5 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.

Don't do this on build that don't include frameworks/base since the
target is not needed and breaks certain builds.

Bug: 110868826
Test: m
Change-Id: I08f06f38d84945f5473618513c641762bc541e24
2018-08-13 16:21:21 +01:00
android-build-team Robot
245a2ad1ac Make change and version bump to PQ1A.180813.001
Change-Id: If70ddfffd95d5d194dfa961214de43abe96c2861
2018-08-13 03:16:06 +00:00
Jason Monk
ff5a2b5694 Merge "Adding overrides support to android_app bps" am: 7e06b26b5e
am: 356a3d4889

Change-Id: I546fb03c659d1c0e2f675685f96704264f91c4dd
2018-08-10 12:32:24 -07:00
Roland Levillain
431ea03e96 Merge "Revert "Pass public API list to class2greylist tool."" am: 3f3505ca5f
am: 67ee73c51e

Change-Id: I772c3f00b5e0b9d342f3308b53edadaae1f89ab9
2018-08-10 12:31:39 -07: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
6639538fd5 Merge "Pass public API list to class2greylist tool." am: edeab211d2
am: b7501daf0a

Change-Id: If40062d94456676239e80f53b3bbf06de32c81dc
2018-08-10 08:48:41 -07:00
Mathew Inwood
edeab211d2 Merge "Pass public API list to class2greylist tool." 2018-08-10 15:21:35 +00:00
android-build-team Robot
2b106427b7 Make change and version bump to PQ1A.180810.001
Change-Id: I1824ba20426e3fab9b8f6c0829501e55bf6f03ca
2018-08-10 03:20:44 +00:00
Colin Cross
e49dccef0c Merge "Add soong_droiddoc_prebuilt.mk" am: 18eeb98faa
am: 3268cfb330

Change-Id: I8b450ae08a7a339a56dc88397b033c0ef51faae0
2018-08-09 13:36:20 -07: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
android-build-team Robot
2753ce181d Make change and version bump to PQ1A.180809.001
Change-Id: Iaf437cd68abbad424802b4ac2a2b5990c1b51c97
2018-08-09 03:15:49 +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
android-build-team Robot
f455fac5c4 Make change and version bump to PQ1A.180808.001
Change-Id: I1f4115843c57c1c955c807f08c65c906128e4060
2018-08-08 03:15:57 +00: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
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
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
android-build-team Robot
2354f7c53e Make change and version bump to PQ1A.180807.001
Change-Id: If7b9224c67e48f72a658c46d1d503625d876f2c9
2018-08-07 03:15:12 +00:00
David Brazdil
a423b4be6f Merge "Make ART engs owners of core/dex_preopt*.mk" am: ad57badfdc
am: 0dcaf387cc

Change-Id: Ib79caaba3173901ae23cdadd81212aa9e5ab848c
2018-08-06 16:29:37 -07: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
6a7263eb82 Merge "hiddenapi: Split stubs into public/system/test classpaths" am: 09480aa0cf
am: d3c9855a2c

Change-Id: If62dd3722ed3f8307b3ddb1ed9b9ffca176d3e48
2018-08-06 15:37:46 -07: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
Isaac Chen
e0feda17dc Merge "Revert "Revert "Build GSIs (aosp_$arch products) in sparse format""" am: 451fa13fa6
am: 3085fc0c05

Change-Id: I873482e8a707ae2930e12fb4a333dbef95812e0b
2018-08-06 13:18:12 -07:00
nelsonli
3510d88531 Merge "Build System: Add variable for copying test config" am: ef2c15314b
am: 66d2f42d40

Change-Id: I9b0528b28e7267b71f6eaccd1111e9b8797509cd
2018-08-06 13:07:36 -07: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
d4f025dd09 Merge "Write the missing system build props to recovery build prop file." am: a130af98ed
am: e0b9cfc6f9

Change-Id: I4e2a7219c9c10f38c1ef8611045322c6541f2307
2018-08-06 11:06:47 -07: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
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
android-build-team Robot
dba5b76223 Make change and version bump to PQ1A.180806.001
Change-Id: I8e0af317560ebd1e2f7eb0bec7c9cc6b7277326b
2018-08-06 03:15:37 +00: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
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
Tao Bao
fa30db2677 Merge "Write custom recovery UI vars as recovery build prop." am: d80175db9a
am: 0324a550a2

Change-Id: I94163bc0dea4597fc8c4feba5027986c59628354
2018-08-03 16:28:55 -07: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
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
android-build-team Robot
9aa2010679 Make change and version bump to PQ1A.180803.001
Change-Id: Id87a91cada5b33fdb30295b867e1c8a0dc0f691b
2018-08-03 03:15:32 +00:00
Yifan Hong
a635a7a00e Merge "target_files: copy to PRODUCT-SERVICES instead" am: 567df6214f
am: 635887d5ac

Change-Id: I31fbc9d77983a4116cbdf6e4e40b2cf84cadcf47
2018-08-02 15:37:06 -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
Tao Bao
fa1a320735 Merge "Add the missing args for building AVB-enabled product-services.img." am: e9bee37677
am: 0e0794f4e4

Change-Id: I1309ce183b45825ea9d22cbdfba899e3c527a637
2018-08-01 22:59:52 -07:00