Commit Graph

55442 Commits

Author SHA1 Message Date
Mitch Phillips c9a79eb8e8 Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict."
am: 30e613a48d

Change-Id: I3606b86577ba2c498cae44f51c1e89076c5fc8d0
2019-09-19 07:08:42 -07:00
Treehugger Robot 30e613a48d Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict." 2019-09-19 13:51:17 +00:00
Mitch Phillips fd6d9022fe Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict.
Adds the backend makefile parser for the LOCAL_FUZZ_DATA vars generated
by the cc_fuzz target.

Bug: 141026328
Test: m example_fuzzer, fuzz target should have adjacent corpus/dict
files.

Change-Id: Ide2c34318f11be132992650ce5cc1fd27895915c
2019-09-18 18:58:28 -07:00
Daniel Norman 28dfca32ca Merge "Creates img.zip from target files zip, not dir."
am: c4f6f36dc4

Change-Id: Id256ea664fcdb2eb5a80d170879a0d27297ddaa2
2019-09-18 18:33:34 -07:00
Treehugger Robot c4f6f36dc4 Merge "Creates img.zip from target files zip, not dir." 2019-09-19 01:03:33 +00:00
Daniel Norman 74eb74b146 Creates img.zip from target files zip, not dir.
Directory support for img_from_target_files was dropped in aosp/1095755.

Test: Create & boot a merged build.
Change-Id: Ib976ea60a24c2f172c597130d6bcce25199a93b3
2019-09-18 14:03:34 -07:00
Colin Cross 7fb589b429 Merge "Remove TARGET_TRANSLATE_2ND_ARCH"
am: bd496d27ad

Change-Id: Ie60e012f488c5f5447c095be07081fd809335de7
2019-09-18 13:59:43 -07:00
Treehugger Robot bd496d27ad Merge "Remove TARGET_TRANSLATE_2ND_ARCH" 2019-09-18 20:47:43 +00:00
Tao Bao 48f797e55c Merge "releasetools: Remove more images out of secondary payload."
am: baa7ca0eca

Change-Id: Ibac4d518d96653f3ca6b6dbbc355c398c70ae491
2019-09-18 10:55:01 -07:00
Tao Bao baa7ca0eca Merge "releasetools: Remove more images out of secondary payload." 2019-09-18 17:37:14 +00:00
Colin Cross 02b50d12be Remove TARGET_TRANSLATE_2ND_ARCH
TARGET_TRANSLATE_2ND_ARCH is never set to true any more,
TARGET_NATIVE_BRIDGE_ARCH := arm is always used instead.

Bug: 141242600
Test: m checkbuild
Change-Id: Id3e0614a1d8a088d37929655b74fecd812606db2
2019-09-18 16:23:04 +00:00
Tao Bao 3e759462d9 releasetools: Remove more images out of secondary payload.
This CL additionally removes boot/dtbo/modem/vbmeta_* images out of
secondary payload. We essentially only keep system_other.img and
bootloader images there.

For Pixel devices, this additionally saves ~80MiB (mostly because of
the removal of boot and radio images).

Bug: 140771390
Test: ota_from_target_files \
          --include_secondary --skip_postinstall \
          -i input-target_files-1.zip \
          input-target_files-2.zip \
          output-ota.zip
Test: python -m unittest test_ota_from_target_files
Change-Id: If47b27c52b3547a4cc86223a988c53960bc6af40
2019-09-17 22:56:19 -07:00
SzuWei Lin 22096814e3 Merge "Revise aosp_x86_arm to inherit from mainline_system directly"
am: 7be2b01f3c

Change-Id: I21626f8bfe8705a4486edf19ff3494dbbbf6db83
2019-09-17 21:53:02 -07:00
Treehugger Robot 7be2b01f3c Merge "Revise aosp_x86_arm to inherit from mainline_system directly" 2019-09-18 04:41:30 +00:00
Harpreet \"Eli\" Sangha 564e016e30 Merge "Add CLI for Directly Invoking IDL APIs"
am: ccbdb22fd4

Change-Id: I3466221032014a2903de7c4a6f241aae886ff5aa
2019-09-17 21:07:03 -07:00
Treehugger Robot ccbdb22fd4 Merge "Add CLI for Directly Invoking IDL APIs" 2019-09-18 03:43:29 +00:00
SzuWei Lin 18ef515e58 Revise aosp_x86_arm to inherit from mainline_system directly
After applying the patch, the contents in system/product align
to the mainline_system/aosp_product.

aosp_x86_arm is not releaseded for GSI. The patch also inherits
from BoardConfigMainlineCommon.mk instead of
BoardConfigGsiCommon.mk. But keeps output system_ext and product
files to /system/system_ext/ and /system/product/.

Bug: 136616665
Test: Compare the product out folder with/without the patch
Change-Id: I2aefbd2d3e71e26219508e53161fa8a3cc2fd652
2019-09-18 02:11:39 +00:00
Colin Cross c43f0bff6d Merge "Remove protobuf vendorcompat from base_vendor.mk"
am: 70ef3c1c9d

Change-Id: Iac8a423aa7b7fc2acecca0a651050d5f7ef67b15
2019-09-17 15:03:47 -07:00
Colin Cross 70ef3c1c9d Merge "Remove protobuf vendorcompat from base_vendor.mk" 2019-09-17 21:49:37 +00:00
Tao Bao 65f2333062 Merge "releasetools: Sanity check the build fingerprint."
am: d5b6094ed3

Change-Id: I6b2af3071e0cbbebddff959605f1b8afacc64c70
2019-09-17 11:44:21 -07:00
Tao Bao 6f756187fa Merge "Also install verity_key to ramdisk for non-system-as-root target."
am: e430f7652a

Change-Id: Ic001692c7cc750bca1e6f226937a874729c52c4a
2019-09-17 11:43:15 -07:00
Tao Bao d5b6094ed3 Merge "releasetools: Sanity check the build fingerprint." 2019-09-17 18:30:45 +00:00
Tao Bao e430f7652a Merge "Also install verity_key to ramdisk for non-system-as-root target." 2019-09-17 18:25:55 +00:00
Logan Chien eb3c242228 Merge "Add check-elf-files as a checkbuild prerequisite"
am: e34b4dea34

Change-Id: Id30b1dabc63cc9ca21a47f746a4bc78cc6cb0077
2019-09-17 11:25:38 -07:00
Logan Chien e34b4dea34 Merge "Add check-elf-files as a checkbuild prerequisite" 2019-09-17 18:08:31 +00:00
Yifan Hong 710d6b1773 Merge "extract-kernel: Fix indexing"
am: 7ca2c1539f

Change-Id: I2e5b85b177f7c941ebb0d4fada4be266d6a2ddae
2019-09-17 10:12:24 -07:00
Yifan Hong 7ca2c1539f Merge "extract-kernel: Fix indexing" 2019-09-17 16:50:36 +00:00
Tao Bao c99819311c Also install verity_key to ramdisk for non-system-as-root target.
The commit in d14b895665
(https://android-review.googlesource.com/c/platform/build/+/728287)
changed partition layout, to always build the root dir into system.img,
even for devices not using system-as-root (i.e. the ones with separate
boot ramdisk).

With the new layout, there will be two root dirs for non-system-as-root
targets during the boot. If such a device uses Verified Boot 1.0,
/verity_key needs to be available in both roots, to establish the chain
of trust.
 - bootloader uses the baked-in key to verify boot.img; it then loads
   the ramdisk from the verified boot.img
 - First stage init uses /verity_key (in ramdisk) to verify and mount
   system.img at /system, then chroot's to it
 - Second stage init uses /verity_key (in system.img) to verify and
   mount other partitions

This CL adds rules to additionally install verity_key into ramdisk for
such targets.

Bug: 139770257
Test: Set up a target to use non-system-as-root
      (BOARD_BUILD_SYSTEM_ROOT_IMAGE != true). `m dist`.
Test: Check that both ROOT/verity_key and BOOT/RAMDISK/verity_key exist
      in the built target_files.zip.
Test: Run validate_target_files to validate the above target_files.zip.
      $ validate_target_files \
          --verity_key_mincrypt /path/to/verity_key \
          target_files.zip
Test: Run sign_target_files_apks to sign the above target. Re-run
      validate_target_files on the signed target_files.zip.
Test: python -m unittest test_validate_target_files
Change-Id: Ibe7e771c8c376429add85851ac86055564765d3c
2019-09-17 08:53:16 -07:00
Tao Bao c4011cd719 releasetools: Sanity check the build fingerprint.
Bug: 140298338
Test: python -m unittest test_ota_from_target_files
Change-Id: I4add5f82d5b684c441b0484732da6991f8e7301a
2019-09-17 08:43:54 -07:00
Jaewoong Jung 8ada3207fb Merge "Revert "Build: Fix test data no present in test suite zip files.""
am: 9f2e68009d

Change-Id: Ib638bed9972d14ccc277ec8aa5879b6496de7409
2019-09-17 07:23:23 -07:00
Jaewoong Jung 9f2e68009d Merge "Revert "Build: Fix test data no present in test suite zip files."" 2019-09-17 14:00:45 +00:00
Yifan Hong 8b72776511 extract-kernel: Fix indexing
The original script always tries to extract from index
0 even if header is found in positive indices. Fix that.

Also, continue to try other positions if previous run failed.

Test: builds
Bug: 139348603

Change-Id: Ia54fc709de9ae587fc64b59d94a1fa4ae669c14f
2019-09-16 16:30:35 -07:00
Colin Cross 5ae5da1345 Remove protobuf vendorcompat from base_vendor.mk
It has been added to the individual products that have prebuilts that
reference libprotobuf-cpp-full.so or libprotobuf-cpp-lite.so.

Bug: 117607748
Test: treehugger
Change-Id: I49b79bc0a0b154596158b66cfafebab451c90a95
2019-09-13 16:00:43 -07:00
Jaewoong Jung 5ea6971a1d Revert "Build: Fix test data no present in test suite zip files."
This reverts commit 068d101077.

Reason for revert: Caused a regression

Test: Added data to a sh_test and compared before vs after
Fixes: 140761783
Change-Id: Ied6427cb2dc3093fb88632eb8f337c2b76e86b95
2019-09-13 19:06:30 +00:00
Harpreet \"Eli\" Sangha 9b29b0cfcb Add CLI for Directly Invoking IDL APIs
Test: Build and Flash
Change-Id: I896423f884659b3081021abf243c63c8e17044df
Signed-off-by: Harpreet \"Eli\" Sangha <eliptus@google.com>
2019-09-13 16:41:40 +09:00
Logan Chien 37e237aa71 Add check-elf-files as a checkbuild prerequisite
This commit adds `check-elf-files` as a `checkbuild` prerequisite so
that prebuilt ELF files can be checked in a `checkbuild` build bot when
`PRODUCT_CHECK_ELF_FILES` is set to `true`.

Bug: 140908693
Test: lunch aosp_walleye-userdebug && make checkbuild
Change-Id: Ifea2f7057eecbf74028e986367f2322ff851f5e4
2019-09-12 21:26:09 -07:00
Elliott Hughes a8cfe0ec57 Merge "Remove macOS special cases pertaining to date(1)."
am: 0b67e41f3f

Change-Id: Ib03100cab82a999208bfb9248bad3ad6208a3cd5
2019-09-12 18:08:00 -07:00
Treehugger Robot 0b67e41f3f Merge "Remove macOS special cases pertaining to date(1)." 2019-09-13 00:47:43 +00:00
Elliott Hughes 648017c2b8 Remove macOS special cases pertaining to date(1).
Bug: http://b/139450866
Test: builds
Change-Id: Idc6cc19cf1b81b51526a7d2ba78020c6decb0031
2019-09-12 15:04:16 -07:00
Raman Tenneti d9f835bab8 Merge "Delete AOSP/Email app."
am: 588d913afe

Change-Id: I13659349026582f9bdc64e55852e20f0e4994c31
2019-09-12 11:42:47 -07:00
Raman Tenneti 588d913afe Merge "Delete AOSP/Email app." 2019-09-12 18:24:04 +00:00
Tianjie Xu 9f07f2b02c Merge "Remove vendor & product in secondary payload"
am: 43a049f814

Change-Id: I9ef8e3e7df274ced39236aa8a46af0ac0a7f2ce4
2019-09-12 11:06:53 -07:00
Tianjie Xu 43a049f814 Merge "Remove vendor & product in secondary payload" 2019-09-12 17:40:22 +00:00
Raman Tenneti 820f20e990 Delete AOSP/Email app.
BUG: 139497239

Test: Manual
$ make -j 40

Change-Id: I2a32694b899bc4f0a0ba36b152c06689427dabf4
2019-09-12 16:31:57 +00:00
Ian Kasprzak 73de478268 Merge "prepare cellbroadcastreceiver to be a mainline module"
am: 68a6e704d6

Change-Id: I518fb7701a8290fc77d21427604dbd10556c19d0
2019-09-12 09:27:23 -07:00
Ian Kasprzak 68a6e704d6 Merge "prepare cellbroadcastreceiver to be a mainline module" 2019-09-12 15:51:30 +00:00
Tianjie Xu 1c8080098a Remove vendor & product in secondary payload
We used to carry the full OTA for vendor and product partitions when
generating the secondary payload. Since they are not actually used, we
can remove them to reduce the size of factory OTA packages. For example,
the size for a sargo package reduces from 454M to 283M after the change.

Bug: 140771390
Test: generate and apply a second payload on Pixel
Change-Id: I091dc07db8c345b182d9f5dd8d48f5c209245641
2019-09-11 15:23:41 -07:00
TreeHugger Robot 8806061821 Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:35 +00:00
Chen Xu 675b92638d prepare cellbroadcastreceiver to be a mainline module
1. prepare two build targets one for updatable module another
for the legacy platform module with diferent config
2. a new cellbroadcastpermissionconfig module to expose
a signature permission.
3. by default, the build include the legacy version.
Later we will switch to the updatable module after more validation
e.g, usre data migration due to uid change
4. for go devies, always include the platform cellbroadcast to
to avoid creating new process

Bug: 135956699
Test: unit test and test app
Change-Id: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
Merged-In: I4d757e27b1e36fbf4890d08afbd45a141bccfc7c
2019-09-11 13:13:05 -07:00
Colin Cross 3c562fa09d Merge changes from topic "protobuf-3.9.1"
am: 64c50b353e

Change-Id: I8659fc88588c6e4e1ebab5e363fa3300b9a4c666
2019-09-11 11:16:22 -07:00