Commit Graph

49869 Commits

Author SHA1 Message Date
Tri Vo 62d51b65aa recovery: install product_file_contexts and product_property_contexts
Product partition is not mounted in recovery mode. Install
product_file_contexts and product_property_contexts into rootdir for
recovery. This is similar to how we deal with system, vendor, and odm
*_contexts files.

And remove unnecessary ifdefs.

Test: m bootimage for pixel 3, product_file_contexts and
product_property_contexts appear in $OUT/recovery/root/
Change-Id: I416d9e6ea742e67a6fe294f1ad8b78fb9b844260
2019-02-19 18:32:55 -08:00
Jiyong Park 34487082ec Merge "Install apexkeys.txt into the target-files package" am: eb0bbdc89a
am: 26919ea581

Change-Id: I1df04af86a2fca2f03fa16bff9362e01e7f6780e
2019-02-19 18:11:24 -08:00
Jiyong Park 26919ea581 Merge "Install apexkeys.txt into the target-files package"
am: eb0bbdc89a

Change-Id: Ie182fa94a420ab9dc3dd9b55544e05f958cd8b60
2019-02-19 18:06:14 -08:00
Treehugger Robot eb0bbdc89a Merge "Install apexkeys.txt into the target-files package" 2019-02-20 01:53:44 +00:00
Bowgo Tsai 12d9c24978 Merge "GSI vbmeta.img: set rollback_index to zero" am: 93030e3f4d
am: 8ef0dae2c6

Change-Id: Iaf0481f4a90a859027bc9b753176cec3840f209e
2019-02-19 17:42:06 -08:00
Bowgo Tsai 8ef0dae2c6 Merge "GSI vbmeta.img: set rollback_index to zero"
am: 93030e3f4d

Change-Id: I6adee5828866fab679fc320959c2c3a02dc577ff
2019-02-19 17:33:54 -08:00
Treehugger Robot 93030e3f4d Merge "GSI vbmeta.img: set rollback_index to zero" 2019-02-20 01:20:09 +00:00
xunchang abfa265f81 Add a flag to skip compatibility check
This serves as a workaround to skip the compatibility check for devices
with incompatible kernels.

Bug: 114240221
Test: generate and check the OTA package for wear device
Change-Id: I65b523a66648af7a77fc3ea79176764fe8ae8d02
2019-02-19 16:27:10 -08:00
Adam Seaton 42eb2750e2 [automerger skipped] [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev Bug:124119313 am: 7d7a3cbcc8 -s ours
am: 8d68f91aad

Change-Id: I652a341402d4dfc9a85b9e5e2aba9b92f16c941c
2019-02-19 15:18:40 -08:00
Adam Seaton 8d68f91aad [automerger skipped] [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev Bug:124119313
am: 7d7a3cbcc8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifedac1475497c66faad15d3ecbfe53bf22aee86b
2019-02-19 15:06:15 -08:00
Yifan Hong b321665b9d Build ODM manifests and fragments for each SKU.
In BoardConfig.mk, ODM manifests can be specify as follows:

    # installed to /odm/etc/vintf/manifest.xml
    ODM_MANIFEST_FILES := device/foo/bar/odm_manifest.xml

    # installed to /odm/etc/vintf/manifest_baz.xml
    ODM_MANIFEST_SKUS := baz
    ODM_MANIFEST_BAZ_FILES := device/foo/bar/odm_manifest_baz.xml

This is preferred over PRODUCT_COPY_FILES because it uses
assemble_vintf to check manifest at build time.

Test: builds

Change-Id: I18517b8ba09d3271627d6f21b8250b1bfc9e5db3
2019-02-19 12:37:50 -08:00
Yu Shan 655f17cf88 Add 32BIT and 16BIT nanopb library.
Add 32BIT and 16BIT compile time flag for nanopb library to support
16BIT or 32BIT size, default is 8BIT. User need to use the corresponding
library when define the PB_FIELD_* flag during compilation.

Change-Id: I0d25bcdf62d6b47733e1ad4bddbd4dfce2192b5d
Test: None
Bug: 122292884
2019-02-19 12:01:43 -08:00
Adam Seaton 7d7a3cbcc8 [DO NOT MERGE] Update platform security string to 2019-04-01 on oc-mr1-dev
Bug:124119313
2019-02-19 18:49:09 +00:00
Jiyong Park bcc8d8a2d4 Install apexkeys.txt into the target-files package
The file contains information about apex-to-keys mappings.

Bug: 124406181
Test: m dist and check if META/apexkeys.txt file exist in the
target-files package.

Change-Id: If8da917a8b4d4e8326614b34067c14ed0df59cb3
2019-02-19 14:18:46 +09:00
Colin Cross 0ab0670fd9 Merge "Remove dexpreopting of boot jars from Make" am: dd025116cd
am: 9b071b8559

Change-Id: Iabbbd6ce0466c7cc0f586829c6566f06dde243e4
2019-02-18 19:11:39 -08:00
Colin Cross 9b071b8559 Merge "Remove dexpreopting of boot jars from Make"
am: dd025116cd

Change-Id: Icfb371218da44ae1e21769d7c258d130e7f212c5
2019-02-18 19:03:12 -08:00
Colin Cross dd025116cd Merge "Remove dexpreopting of boot jars from Make" 2019-02-19 02:55:16 +00:00
Bowgo Tsai c1a8f1a5d7 GSI vbmeta.img: set rollback_index to zero
The major purpose of vbmeta.img built on GSI targets (e.g., aosp_arm,
aosp_arm64, etc) is to disable AVB. We should also set the rollback
index to zero, to prevent the device bootloader from updating the
last seen rollback index in the tamper-evident storage.

Bug: 122583908
Test: build aosp_arm64, then `avbtool info_image --image $OUT/vbmeta.img`
Change-Id: I48a49957f8dd3169003b9507fe80e519f301d5b5
2019-02-19 10:38:40 +08:00
Xin Li 8569735752 DO NOT MERGE - Merge PPRL.190205.001 into master
Bug: 124234733
Change-Id: I13bccc848fc7e7d883116c5f7c08079e27ec97a3
2019-02-18 15:57:59 -08:00
vichang 2adcb9f2fa Merge "Add a bug number in the TODO tag" am: 4ea3ad0e34
am: cdaa9001fe

Change-Id: I816c3a78ee1e73a448133ec43355c15bce8475da
2019-02-18 10:02:15 -08:00
vichang cdaa9001fe Merge "Add a bug number in the TODO tag"
am: 4ea3ad0e34

Change-Id: I46a5d98cf9bf6a266c273f055eb61a19f35d39a1
2019-02-18 09:58:03 -08:00
vichang 4ea3ad0e34 Merge "Add a bug number in the TODO tag" 2019-02-18 17:51:53 +00:00
Victor Chang 575379e30b Add a bug number in the TODO tag
- ICU4C is kept in PRODUCT_PACKAGES for the app compat issue

Bug: 124218500
Test: Treehugger
Change-Id: I9b98321c639e99c59e6a5ea45dd380f5f731a419
2019-02-18 11:54:07 +00:00
Luca Stefani 428b90c473 Merge "Fix flags argument passed to avbtool for GSI images" am: 6867fd7dda
am: 15c83f9713

Change-Id: I118b7a8d43ac292e8a14b98dd3fdaa153e1ee9f0
2019-02-17 21:42:41 -08:00
Bowgo Tsai a18a5fe46f Merge "Support verifying system_other" am: 01a05483ed
am: f509e54bd0

Change-Id: I16f65c01659fa1664451a25395c340e55f0b39b5
2019-02-17 21:38:41 -08:00
Luca Stefani 15c83f9713 Merge "Fix flags argument passed to avbtool for GSI images"
am: 6867fd7dda

Change-Id: I59e0f4ce435535a6c1e6617061bb40d7ade7bfc3
2019-02-17 21:38:31 -08:00
Bowgo Tsai f509e54bd0 Merge "Support verifying system_other"
am: 01a05483ed

Change-Id: I343ac68c70195d2c9e035b92ef44f196fe731deb
2019-02-17 21:34:32 -08:00
Treehugger Robot 6867fd7dda Merge "Fix flags argument passed to avbtool for GSI images" 2019-02-18 05:27:52 +00:00
Treehugger Robot 01a05483ed Merge "Support verifying system_other" 2019-02-18 05:21:27 +00:00
Jeongik Cha 52822b33c8 Merge "Clean up noisy error log in find-shareduid-violation.py" am: 50b4b395bc
am: d9182b546c

Change-Id: Ida83b37a9cda33d2f15c57b74891c5e6942f8c2a
2019-02-16 20:33:57 -08:00
Jeongik Cha d9182b546c Merge "Clean up noisy error log in find-shareduid-violation.py"
am: 50b4b395bc

Change-Id: I643ffdb62536e48c288ab6cfe902e081908213d1
2019-02-16 20:29:46 -08:00
Treehugger Robot 50b4b395bc Merge "Clean up noisy error log in find-shareduid-violation.py" 2019-02-17 04:19:41 +00:00
Roman Kiryanov 274d8f8508 Merge "Use predefined macros instead of hardcoding the path" am: 06ec0577b6
am: af38e1765f

Change-Id: I6a7e24ac1875c833f3d2cdd0f18792df88b39fc2
2019-02-16 15:10:54 -08:00
Roman Kiryanov af38e1765f Merge "Use predefined macros instead of hardcoding the path"
am: 06ec0577b6

Change-Id: I96baf1b12e11d7e7a4c4863dc9ed3c22c97c0568
2019-02-16 15:07:43 -08:00
Treehugger Robot 06ec0577b6 Merge "Use predefined macros instead of hardcoding the path" 2019-02-16 22:56:47 +00:00
Jeongik Cha b806c44326 Clean up noisy error log in find-shareduid-violation.py
The script makes noisy error although fallback cmd succeed.

So make the script writes error log only if both of commands fail.

Bug: 124470143
Bug: 123664116
Test: m -j out/target/product/$(get_build_var TARGET_DEVICE)/shareduid_violation_modules.json
Test: And there is no error log in stderr
Change-Id: I3d4756066ee6904826c18754969fd4190bd02e1e
2019-02-16 10:50:56 +09:00
Bill Peckham ad2967f980 Merge "Adding initial merge_target_files.py script to merge two target files packages." am: 194b1c8508
am: 7591615cb4

Change-Id: I3c15c100c32999896bcfdb49827758b91b1b4f02
2019-02-15 17:49:20 -08:00
Bill Peckham 7591615cb4 Merge "Adding initial merge_target_files.py script to merge two target files packages."
am: 194b1c8508

Change-Id: Id162301d1fd6bb8cfebcba29d0da47a29658994e
2019-02-15 17:45:11 -08:00
Bill Peckham 194b1c8508 Merge "Adding initial merge_target_files.py script to merge two target files packages." 2019-02-16 01:40:36 +00:00
Bill Peckham 8a3f469bae Merge "Include soong_zip in OTA tools package." am: f3c50438c3
am: 19d6b0fbe5

Change-Id: Ic1cefba88dfd14bfdff05717d28b665e1599552b
2019-02-15 16:58:14 -08:00
Bill Peckham 19d6b0fbe5 Merge "Include soong_zip in OTA tools package."
am: f3c50438c3

Change-Id: Ice539fef08bd66a82cb6b2ba60d4c7da617fc9eb
2019-02-15 16:45:54 -08:00
Bill Peckham f3c50438c3 Merge "Include soong_zip in OTA tools package." 2019-02-16 00:38:07 +00:00
Roman Kiryanov cff49144c0 Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE" am: 7848e3cfef
am: 27a67bac5c

Change-Id: I6c14d67438aa6ea0bc1cc9179c48d11b55116a07
2019-02-15 16:17:28 -08:00
Roman Kiryanov 27a67bac5c Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE"
am: 7848e3cfef

Change-Id: Icf2c7e630bd5009b78015ef6aa275e7c199cd5eb
2019-02-15 16:12:21 -08:00
Treehugger Robot 7848e3cfef Merge "Check INSTALLED_SYSTEMIMAGE_TARGET to build INSTALLED_QEMU_SYSTEMIMAGE" 2019-02-15 23:53:03 +00:00
Tom Cherry 5fff1244be Merge "Use fs_config_generator.py to generate fs_config_files/dirs directly" am: b21b108ddf
am: b133ed8e18

Change-Id: I9ce904fbe25fd4bfbf20e5775767f6f8dd5aa5d9
2019-02-15 14:56:05 -08:00
Tom Cherry b133ed8e18 Merge "Use fs_config_generator.py to generate fs_config_files/dirs directly"
am: b21b108ddf

Change-Id: Ifd4e880ad0d6e15a9eb06d5838041615370ca7ef
2019-02-15 14:51:55 -08:00
Tom Cherry b21b108ddf Merge "Use fs_config_generator.py to generate fs_config_files/dirs directly" 2019-02-15 22:41:32 +00:00
Bill Peckham e9eb5f96e0 Adding initial merge_target_files.py script to merge two target files packages.
This script takes as input two partial target files (one contains system bits,
and the other contains non-system, or other, bits). The script merges the
contents of the two partial target files packages to produce a complete target
files package.

Bug: 123430711
Test: Build two partial target files, merge, compare with full target files.
Test: Validate merged target files via validate_target_files.py.
Change-Id: Ic24acf43b86fc703fb4c970688b006291a1861f8
2019-02-15 13:25:16 -08:00
Colin Cross 47e384c3d6 Remove dexpreopting of boot jars from Make
Dexpreopting of boot jars is now implemented in
build/soong/java/dexpreopt_bootjars.go.

Test: m checkbuild
Change-Id: I036510e7674b876976ce191c5b18bf0b7a15c6ee
2019-02-15 13:00:14 -08:00