Jaekyun Seok
d1b1d594a5
Merge "Support /product partition" am: 8fe7f9bfa2 am: 039e0991d5
...
am: f430ea5ebf
2018-01-25 04:16:57 +00:00
Jaekyun Seok
b7735d8105
Support /product partition
...
This CL adds the following build flags to support building product partition
from Android build system.
- BOARD_AVB_PRODUCT_ADD_HASHTREE_FOOTER_ARGS
- BOARD_AVB_PRODUCT_KEY_PATH
- BOARD_AVB_PRODUCT_ALGORITHM
- BOARD_AVB_PRODUCT_ROLLBACK_INDEX_LOCATION
- BOARD_PREBUILT_PRODUCTIMAGE
- BOARD_PRODUCTIMAGE_EXTFS_INODE_COUNT
- BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE
- BOARD_PRODUCTIMAGE_PARTITION_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_BLOCK_SIZE
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR
- BOARD_PRODUCTIMAGE_SQUASHFS_COMPRESSOR_OPT
- BOARD_PRODUCTIMAGE_SQUASHFS_DISABLE_4K_ALIGN
- BOARD_USES_PRODUCTIMAGE
- LOCAL_PRODUCT_MODULE
- PRODUCT_FOOTER_ARGS
- PRODUCT_PRODUCT_BASE_FS_PATH
- PRODUCT_PRODUCT_VERITY_PARTITION
- TARGET_COPY_OUT_PRODUCT
- TARGET_OUT_PRODUCT*
And PRODUCT_PRODUCT_PROPERTIES is added to save product-specific
properties in /product/build.prop.
Bug: 64195575
Test: succeeded building product.img with BOARD_PRODUCTIMAGE_PARTITION_SIZE,
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE and PRODUCT_PRODUCT_VERITY_PARTITION.
Change-Id: I774e6a38003734421591e51bed103802ff84f432
2018-01-25 09:33:58 +09:00
Jin Qian
95873268f3
Merge "Add BOARD_EXT4_SHARE_DUP_BLOCKS to share duplicated blocks on ext4" am: 082837365d am: b6ff980ba5
...
am: 931d76e1c4
2018-01-24 04:21:38 +00:00
Jin Qian
fde9f7906b
Add BOARD_EXT4_SHARE_DUP_BLOCKS to share duplicated blocks on ext4
...
This option applies to system.img and vendor.img.
Bug: 64109868
Change-Id: Ib4c7384049dca08e57441ef71cc81c2fba4462dd
2018-01-22 17:21:11 -08:00
Sen Jiang
1e1c35d051
Merge "Remove zlib_fingerprint support." am: 53a3f70efe am: 2dfaacdd93
...
am: c5ed82950b
2017-12-27 21:00:08 +00:00
Treehugger Robot
53a3f70efe
Merge "Remove zlib_fingerprint support."
2017-12-27 20:49:24 +00:00
Sen Jiang
43935639fb
Remove zlib_fingerprint support.
...
Test: m dist
Change-Id: I580993e5089b3eb73af0ee931dd222ebfd3a8593
2017-12-20 13:14:14 -08:00
Tao Bao
90a2bcc3e0
Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS." am: d30b75190d am: 4d45f51596
...
am: 3652c0ba76
2017-12-18 22:31:32 +00:00
Treehugger Robot
d30b75190d
Merge "Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS."
2017-12-18 22:17:46 +00:00
Baligh Uddin
92855dba09
Merge "Add generate_verity_key (+dependencies) to otatools package." am: c4f76d670a am: d60a86c3ca
...
am: 10882a317c
2017-12-18 20:50:07 +00:00
Baligh Uddin
c8bef14c9f
Add generate_verity_key (+dependencies) to otatools package.
2017-12-18 10:40:57 -08:00
Steven Moreland
85d325b5f8
Merge changes from topic "kati-obsolete-full-treble" am: 2b1f0d1810 am: a710d44086
...
am: 9874ee6c54
2017-12-18 18:06:07 +00:00
Steven Moreland
ae69e5787a
PRODUCT_NOTICE_SPLIT from PRODUCT_FULL_TREBLE
...
- until PRODUCT_NOTICE_SPLIT is the default
- disallow PRODUCT_NOTICE_SPLIT_OVERRIDE because it
doesn't need to be differentiated.
Bug: 69865032
Test: manual
Change-Id: I4a29c298862fc9fab51755bf19f236f61fbd784d
2017-12-15 14:52:07 -08:00
Przemyslaw Szczepaniak
6686e51b75
Merge "Add PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"
2017-12-13 10:15:46 +00:00
Treehugger Robot
973301af79
Merge "Replace build/tools with build/make/tools"
2017-12-13 02:34:42 +00:00
Justin Yun
2a233b3b86
Define PLATFORM_VNDK_VERSION
...
PLATFORM_VNDK_VERSION means the VNDK version that current build
provides. This value will be set to PLATFORM_SDK_VERSION once the
version is release. Otherwise, it will be set to "current".
Bug: 69883025
Test: device boot
Change-Id: I3fde4943aa062d9d148a3d7fc2798948870a48c6
2017-12-13 10:48:34 +09:00
Przemyslaw Szczepaniak
e554015b3a
Add PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION
...
Exposed as ro.build.version.min_supported_target_sdk build_property
Test: make
Bug: 63926630
Change-Id: I8084fd4c54d9c2fb5e2683430e2b3aaf4c5f4a7a
2017-12-11 10:45:45 +00:00
Jaegeuk Kim
10c9f5d9d3
Merge "core, release: add sload.f2fs for otatools.zip"
2017-12-08 00:57:42 +00:00
Tao Bao
79d52f8798
Remove the support for BOARD_HAS_EXT4_RESERVED_BLOCKS.
...
This is only used in file-based OTA, where we may reserve space on
/system partition. With the deprecation of file-based OTA since O, the
code has become obsolete.
Test: `m dist`
Change-Id: I2bd686b292f93b566fe28a2bcd74c564ffc75dac
2017-12-07 14:36:21 -08:00
Treehugger Robot
94ea878ae0
Merge "Revert "Renames sepolicy files from nonplat_* to vendor_*""
2017-12-07 04:02:29 +00:00
Bo Hu
9eb4d74e26
Revert "Renames sepolicy files from nonplat_* to vendor_*"
...
This reverts commit 38c404c6da
2017-12-07 00:16:35 +00:00
Colin Cross
fdea893833
Replace build/tools with build/make/tools
...
Test: m checkbuild
Change-Id: I8db6c27a6d2372f142d10568fe92d6f2e9a59252
2017-12-06 16:12:40 -08:00
Colin Cross
3277ba34ae
Add java modules to soong_to_convert.txt
...
Test: examine soong_to_convert.txt
Change-Id: Ibb6db664238a4e98f5d8885dfb3ddc0f35d11ff6
2017-12-06 15:38:52 -08:00
Xin Li
5f03da0404
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
2017-12-06 23:18:30 +00:00
Treehugger Robot
7b2129f101
Merge "AVB: If building recovery.img, add AVB hash footer."
2017-12-06 22:12:25 +00:00
kaichieh
24ed707951
Merge "Renames sepolicy files from nonplat_* to vendor_*"
...
am: 291768ef7f
2017-12-06 10:11:32 +00:00
Treehugger Robot
291768ef7f
Merge "Renames sepolicy files from nonplat_* to vendor_*"
2017-12-06 10:00:46 +00:00
Jaegeuk Kim
2ea1eba98c
core, release: add sload.f2fs for otatools.zip
...
This also updates mkf2fsuserimg.sh to call sload.f2fs.
Change-Id: I245f6b3dfcd966fbc6783329d781375879fcd065
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2017-12-05 10:59:50 -08:00
Chih-Hung Hsieh
614877c921
Merge "No need to dump modules added -Werror."
...
am: 531ce804ea
2017-12-05 01:37:16 +00:00
Treehugger Robot
531ce804ea
Merge "No need to dump modules added -Werror."
2017-12-05 01:24:49 +00:00
Steven Moreland
c8a55698ac
Merge "Revert "Include Treble metadata on Treble enabled devices""
...
am: 79a55b3108
2017-12-05 00:42:11 +00:00
Chih-Hung Hsieh
ab149cbda0
No need to dump modules added -Werror.
...
* This reduces size of output file wall_werror.txt.
* Stop collecting $(MODULES_ADDED_WERROR)
Bug: 66996870
Test: normal build
Change-Id: Id750cc7fe6489a7654b20740d503226ec6941bbb
2017-12-04 15:23:37 -08:00
David Zeuthen
8fecb289ee
AVB: If building recovery.img, add AVB hash footer.
...
In some non-A/B setups, recovery.img is still being used. If AVB is
enabled, we currently don't add a hash footer to recovery.img nor do
we include the hash digest in vbmeta.img. This CL fixes that.
This was tested on a build with the following settings
TARGET_NO_RECOVERY := false
BOARD_USES_RECOVERY_AS_BOOT := false
BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 33554432
BOARD_AVB_RECOVERY_ADD_HASH_FOOTER_ARGS := --prop foo:bar
and then it was verified using 'avbtool info_image' that recovery.img
has a hash footer and a 'foo' property with the value 'bar'. This was
also checked successfully for vbmeta.img.
Test: See above.
Bug: None
Change-Id: I98124d5661ea768411416fa8d2a2ae6cc664fdc8
2017-12-04 13:54:38 -05:00
Steven Moreland
7a9b07f6fe
Revert "Include Treble metadata on Treble enabled devices"
...
The test rather than the build system needs to check
the files according to the versions of the provided
device (and it does so now).
Fixes: 69864925
Test: clean revert, manual
(revert of cb5b8d2d47
2017-12-04 09:37:39 -08:00
Tao Bao
0ef0aef16b
Merge "Remove the redundant/wrong write of 'recovery_as_boot='."
...
am: 4dd8610e26
2017-12-01 19:33:22 +00:00
Treehugger Robot
4dd8610e26
Merge "Remove the redundant/wrong write of 'recovery_as_boot='."
2017-12-01 19:26:08 +00:00
kaichieh
38c404c6da
Renames sepolicy files from nonplat_* to vendor_*
...
Bug: 64240127
Test: normal boot and recovery boot a device
Change-Id: Ie30b4859d4d573cd2d35419195181695639f6582
2017-12-01 13:56:16 +08:00
Bowgo Tsai
91676f9154
Merge "Reorder assert-max-image-size and AVB signing"
...
am: 8552bebed4
2017-11-29 09:17:35 +00:00
Treehugger Robot
8552bebed4
Merge "Reorder assert-max-image-size and AVB signing"
2017-11-29 09:10:27 +00:00
Bowgo Tsai
6a74979a3b
Include vbmeta.img into <product>-img.zip
...
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Merged-In: I3e09f036441bcf7e98d8f76360df1e17466ae38e
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
(cherry picked from commit 6bbb11a620
2017-11-29 16:14:19 +09:00
Michael Schwartz
465197ed16
Merge "Support prebuilt bootimage"
...
am: 52a4f7d2b7
2017-11-29 04:52:49 +00:00
Michael Schwartz
0dc6f21779
Support prebuilt bootimage
...
Bug: 63676296
Test: `m -j` and inspect artifacts
Merged-In: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
Change-Id: Id32d8a7151a8e99b45aa58ee9971def9734eaf78
(cherry picked from commit b0b1a24b1e
2017-11-28 20:18:34 +09:00
Bowgo Tsai
03b9c8e637
Reorder assert-max-image-size and AVB signing
...
This change fixes the following warning message:
WARNING: out/target/product/$(TARGET_DEVICE)/boot.img approaching \
size limit (33554432 now; limit 33554432)
This is because AVB signing will increase boot.img to
BOARD_BOOTIMAGE_PARTITION_SIZE, in order to place the AVB metadata at
the end of the partition. We should check max image size first then use
avbtool to sign it.
The max allowed size will be (partition size - AVB_HASH_META_SIZE) when
AVB is enabled.
Note that some projects don't have BOARD_{BOOT,RECOVERY}IMAGE_PARTITION_SIZE,
we should skip assert-max-image-size for it.
Finally, this CL also fixes the build error for `make bootimage-nodeps`
when AVB is used.
Bug: 69115400
Test: build and checks there is no size limit warning message
Change-Id: I54f28c6f1c9fe9ed88c1d73e5cb72b3693593f9b
2017-11-22 17:46:33 +08:00
Tomasz Wasilczyk
c792d08bd2
Merge "Silence yet more superfluous build messages."
...
am: 01e1fe60b8
2017-11-22 01:25:29 +00:00
Tomasz Wasilczyk
01e1fe60b8
Merge "Silence yet more superfluous build messages."
2017-11-22 01:20:32 +00:00
Chih-hung Hsieh
39610026fb
Merge "Add default -Wall -Werror or -Wall."
...
am: 6ddc7843cb
2017-11-21 21:24:12 +00:00
Bowgo Tsai
8dbeec4e9e
Merge "Revert "Reorder assert-max-image-size and AVB signing""
...
am: aac41d585c
2017-11-21 03:07:05 +00:00
Bowgo Tsai
47e0b62d6e
Revert "Reorder assert-max-image-size and AVB signing"
...
This reverts commit b855c0c304
2017-11-21 02:39:51 +00:00
Bowgo Tsai
d16f9c5301
Merge "Reorder assert-max-image-size and AVB signing"
...
am: eea732dbcf
2017-11-21 01:33:07 +00:00
Chih-Hung Hsieh
1876acdd53
Add default -Wall -Werror or -Wall.
...
* Skip Android.bp, prebuilt, and HEADER_LIBRARIES targets.
* If neither -Wno-error nor -Werror is used, add default -Wall -Werror.
However, if the build target is in a project
under one of ANDROID_WARNING_ALLOWED_PROJECTS, add only -Wall.
* Dump name of modules using -Wno-error or added -Wall -Werror
into file $(PRODUCT_OUT)/wall_werror.txt.
Bug: 66996870
Test: normal build
Change-Id: Ief8cf776e8613ed073a64dd271534688845d5c2c
2017-11-17 14:06:35 -08:00
