Commit graph

1902 commits

Author SHA1 Message Date
Treehugger Robot
68883e0717 Merge "Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"" 2018-08-17 20:32:18 +00:00
Shawn Yang
87021065b9 Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"
This reverts commit 77c778c040.

Reason for revert: git-master break on 4960355

Change-Id: I2fd272c63ef496067f12852bcf98ffc1194c54bf
2018-08-17 19:02:08 +00:00
Tianjie Xu
ccbae48ac5 Generates the care_map.txt in protobuf format
Call the host binary care_map_generator to generate the care_map in
protobuf format. The parsing part of proto messages has already been
supported in the update_verifier.

Bug: 77867897
Test: unittests pass; run add_image_to_target_files
Change-Id: I40d3184b4b5c48a6dd55203afc84cca73d5765e9
2018-08-17 17:39:00 +00:00
Nan Zhang
075435035f Merge "Change dependency name to api-stubs-docs_annotations.zip" 2018-08-17 16:53:12 +00:00
Dario Freni
77c778c040 s/PRODUCT-SERVICES/PRODUCT_SERVICES/g
Attempting to reduce the number of different spellings we have for
"product-services" in the codebase.

Bug: 112431447
Test: m
Change-Id: Iec531122297cf4b86ff8601732d4ab7ccf5c2183
2018-08-17 00:28:17 +01:00
Treehugger Robot
7911fd3b91 Merge "Make duplicate COPY_HEADERS an error" 2018-08-16 16:33:21 +00:00
Treehugger Robot
c272a99b5c Merge "Add support for /odm partition" 2018-08-16 03:37:36 +00:00
Dan Willemsen
7f9bd56b8a Make duplicate COPY_HEADERS an error
Test: on internal device that has warnings, test with
BUILD_BROKEN_DUP_COPY_HEADERS true and unset.
Test: build_test on downstream branches
Change-Id: I2cebd99b10f13fb75167dc8370ba762f94c41c2a
2018-08-15 15:08:15 -07:00
Tao Bao
1fa790cb53 Merge "Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET." 2018-08-15 17:59:47 +00:00
Tao Bao
10fc949873 Reland "Generate the list of installed files in recovery image."
This reverts commit 60a47827cb to reland
the change that generates installed-files-recovery.{txt,json}.

This CL addresses the previous issue by explicitly depending on
INSTALLED_BOOTIMAGE_TARGET or INSTALLED_RECOVERYIMAGE_TARGET. This
avoids the race condition between INSTALLED_{BOOT,RECOVERY}IMAGE_TARGET
and INSTALLED_FILES_FILE_RECOVERY. As a result, it will also give a
complete list of files that are installed to recovery ramdisk image.

Bug: 30414428
Test: `m dist` with aosp_taimen-userdebug. Check the generated files of
      $OUT/installed-files-recovery.{txt,json}.
Change-Id: I8bde0dafda7d8ed9c4113dc82553c4edc7f79548
2018-08-14 23:32:32 -07:00
Tao Bao
b1a2e353f2 Remove the hack that uses INSTALLED_RAMDISK_TARGET as INSTALLED_BOOTIMAGE_TARGET.
This also fixes the emulator build issue with `BOARFD_AVB_ENABLE := true`.

Bug: 78113934
Test: `m dist` with emulator builds.
Test: `m dist` with aosp_taimen-userdebug
Change-Id: I2089e0ab15885b4cfc16d4a7e8be3dd0b60ef46f
2018-08-14 16:17:12 -07:00
Tao Bao
60a47827cb Revert "Generate the list of installed files in recovery image."
This reverts commit 774f63db4a.

Bug: 112590987
Test: N/A
Change-Id: I7b1c642149d45071ae4c8c9a2cedc40b4e360397
2018-08-14 11:30:58 -07:00
Alex Light
1efb8a7a83 Merge "Revert "Build image for clean super partition."" 2018-08-14 16:34:26 +00:00
Alex Light
989b3ad859 Revert "Build image for clean super partition."
This reverts commit 8a72da6c63.

Reason for revert: breaks a build

Change-Id: I743a67757c560b5bb2b201612d0898276b6804b6
Test: None.
2018-08-14 16:25:52 +00:00
Treehugger Robot
6f08de7963 Merge "Build image for clean super partition." 2018-08-14 02:54:02 +00:00
Tao Bao
cf8853b599 Suppress the warning when copying init.recovery.*.rc.
The file is optional, and we already ignore the cp result.

cp: cannot stat 'out/target/product/taimen/root/init.recovery.*.rc': No such file or directory

Test: `m -j bootimage` with aosp_taimen-userdebug. No more warning.
Change-Id: I815c6e0ff8d432123066cf4a44a8638dc94c96d5
2018-08-13 14:30:04 -07:00
David Anderson
8a72da6c63 Build image for clean super partition.
This adds a new super_empty.img output to the build when
PRODUCT_USE_LOGICAL_PARTITIONS is true and a super partition size is
set. This will be used by fastboot flashall in fastbootd, since it needs
a record of the partition layout in case the super partition is corrupt
or not yet flashed.

The full super.img (which contains embedded partition data) is still
available via "make dist".

Bug: 78793464
Test: super_empty.img generated when PRODUCT_USE_LOGICAL_PARTITIONS is
      true

Change-Id: I9f00b07e5b685a3230803fa1a5a569544d0ab625
2018-08-13 13:13:08 -07:00
Tao Bao
774f63db4a Generate the list of installed files in recovery image.
We're putting more files into recovery image since adding the support
for using shared libraries in recovery. This CL generates the list of
files to help understand the exact files installed there and their
sizes.

Bug: 112494634
Test: `m dist` with aosp_marlin-userdebug. Check the generated file at
      out/dist/installed-files-recovery.{txt,json}.
Change-Id: I7a9e05da52f95059a7d7adc85c74e888125ee66e
2018-08-13 09:19:17 -07: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
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
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
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
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
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
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
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
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
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
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
Colin Cross
9d2fe1b5c7 Merge "Revert "Build GSIs (aosp_$arch products) in sparse format""
am: a2b0e478d3

Change-Id: Ia2191fd7e0653f7f634bf273667aecbdffa5635c
2018-08-01 02:29:23 -07:00
Treehugger Robot
a2b0e478d3 Merge "Revert "Build GSIs (aosp_$arch products) in sparse format"" 2018-08-01 09:24:25 +00:00
Colin Cross
132748cb80 Revert "Build GSIs (aosp_$arch products) in sparse format"
This reverts commit bc0248f211.

Reason for revert: Triggered preexisting issue with e2fsck and ASAN

Bug: 112062612
Change-Id: I7b52fe539252ab1bb7229d32accb7abd6417f470
2018-08-01 06:26:03 +00:00
Yi-yo Chiang
ca66daa5ce Merge "Change the content of lsdump_paths.txt to newline-separated paths"
am: 989ba9d502

Change-Id: Idd704ca4e61f2a885ec503de9270c6f406daec8d
2018-07-31 23:12:36 -07:00
Treehugger Robot
989ba9d502 Merge "Change the content of lsdump_paths.txt to newline-separated paths" 2018-08-01 06:02:30 +00:00
Tao Bao
139c727036 Write custom recovery UI vars as recovery build prop.
We used to consume target-specific recovery UI variables at build time,
by passing them as macros, which prevents from building recovery with
Soong. This CL writes these vars as build properties, which can be
queried by recovery at runtime.

With this CL (and the change to recovery), it also allows customizing
these properties at boot time, e.g. by init based on the device SKU.

Bug: 110380063
Test: `m bootimage` with aosp_taimen-userdebug. Check that recovery build
      property file ($OUT/recovery/root/prop.default) has
      `ro.recovery.ui.margin_height=105`.
Change-Id: I53409593779e604b8d8c727d522d9eb76e14508a
2018-07-31 21:09:40 -07:00
Yifan Hong
2dae5721d4 Split PRODUCT_USE_LOGICAL_PARTITIONS into sub-flags.
Split the flag into PRODUCT_USE_DYNAMIC_PARTITION_SIZE
and PRODUCT_BUILD_SUPER_PARTITION. More sub-flags can be
added with the same way.

Also change some checks with USE_LOGICAL_PARTITIONS with
the appropriate sub-flags.

This allows easier device bring-up to fulfill the requirements
separately.

This also enables dynamic partition size without logical patition.
Originally, to enable BOARD_*_PARTITION_RESERVED_SIZE must also
enable PRODUCT_USE_LOGICAL_PARTITIONS. The patch fix the rule to
let dynamic partition size is able to be used independently.

Fixes: 111966003

Test: make superimage with PRODUCT_USE_LOGICAL_PARTITIONS
Change-Id: I45b29c87bf94356d8416bbd58a14c8982039c222
2018-08-01 00:39:13 +00:00
Isaac Chen
442e2f4441 Merge "Build GSIs (aosp_$arch products) in sparse format"
am: 44c61176e8

Change-Id: Icfb51956662a4dbca0f8cf37ea9e4ddc6fe1c214
2018-07-31 09:05:31 -07:00
Treehugger Robot
44c61176e8 Merge "Build GSIs (aosp_$arch products) in sparse format" 2018-07-31 15:52:08 +00:00
Hung-ying Tyan
3868a7fd9a Merge "Add more ro.vendor.build.*"
am: 2e0fb33af8

Change-Id: I9357d2e338198eb59ad7a9472bd82ca75177412a
2018-07-31 01:13:20 -07:00
Treehugger Robot
2e0fb33af8 Merge "Add more ro.vendor.build.*" 2018-07-31 08:07:57 +00:00
Treehugger Robot
7654023bcd Merge "Adding VENDOR_SECURITY_PATCH to vendor partition build.prop" 2018-07-31 03:33:36 +00:00
Yi-yo Chiang
ac0d49fe1e Change the content of lsdump_paths.txt to newline-separated paths
This commit changes the delimiters from space characters to newline
characters so that lsdump_paths.txt can be easily read and parsed by
human.

Bug: 111814844
Test: m vndk findlsdumps -j18
Change-Id: I5c50934a0f035244cff71351d9f4be4203222590
2018-07-30 18:45:17 +00:00
Yifan Hong
8883a739b3 Merge changes I1459d62f,I4c2b975e
am: bb937a6b69

Change-Id: Ifdedee1b0251bc9c2a8baf30d28b5d315b5c9e20
2018-07-30 11:35:33 -07:00