Commit graph

55427 commits

Author SHA1 Message Date
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
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
Colin Cross
64c50b353e Merge changes from topic "protobuf-3.9.1"
* changes:
  Keep proguard fields for lite runtime
  Install vendorcompat verison of protobuf
  Make javanano a plugin
2019-09-11 18:00:16 +00:00
Tom Cherry
86423cc8e9 Merge "fs_config: Fix generation for devices without vendor partition"
am: 00a086ccc8

Change-Id: Ie2c15635f74c9c84aebba42525e3c3328895f96b
2019-09-11 08:33:45 -07:00
Tom Cherry
00a086ccc8 Merge "fs_config: Fix generation for devices without vendor partition" 2019-09-11 15:10:56 +00:00
Bowgo Tsai
4dc7d76c83 Merge "Moving GSI-specific properties to /system_ext"
am: f558b46466

Change-Id: Ic6efd929d0a729209ddc1b0bade209d35d11626e
2019-09-11 00:29:38 -07:00
Treehugger Robot
f558b46466 Merge "Moving GSI-specific properties to /system_ext" 2019-09-11 07:03:05 +00:00
Bowgo Tsai
06533fef4a Moving GSI-specific properties to /system_ext
We're now adding a core CSI system.img that is common across different
targets. So GSI-specific things should be moved to /system_ext.

Also renaming various generic*/system.prop to generic*/system_ext.prop.
This is to put the customization into /system_ext/build.prop instead of
/system/build.prop.

Bug: 137711197
Test: boot a GSI on crosshatch, and checks the value of those properties
Change-Id: Id344124280d5f4a6c10d390a9e8a4a50cc7f28fb
2019-09-10 21:55:32 +08:00
dianlujitao
5dcbe701cf fs_config: Fix generation for devices without vendor partition
If the "--all-partitions" argument is empty, the system fs_config should
be generated with all partitions emitted.

Fixes: 8453f02c (fs_config: Fix cases without vendor/oem partition)
Change-Id: I058cfd1c8e665b40757998e773c35e26465bf58a
Signed-off-by: dianlujitao <dianlujitao@lineageos.org>
2019-09-10 16:17:47 +08:00
Bo Hu
045d1e8e68 Merge "emulator: convert sdk_phone_x86 and 64 to CSI"
am: 5242dc18bf

Change-Id: I78d27fe3b48aeecec75c557d9553cd85a06b8560
2019-09-09 20:20:15 -07:00
Bo Hu
5242dc18bf Merge "emulator: convert sdk_phone_x86 and 64 to CSI" 2019-09-10 03:02:12 +00:00
Jooyung Han
76d0eb4d68 Merge "Skip *.libraries.txt when skipping current vndk"
am: 2359e05efb

Change-Id: I972f450e4435be5ca4e77a2d89408882fa6f3305
2019-09-09 18:30:52 -07:00
Jooyung Han
2359e05efb Merge "Skip *.libraries.txt when skipping current vndk" 2019-09-10 01:04:35 +00:00
Colin Cross
c018e8dea9 Merge "Use more variables from Soong"
am: d30a949547

Change-Id: Ia89e7b9efb6833cfc07d135a60bad670189e4ab9
2019-09-09 10:38:56 -07:00
Colin Cross
d30a949547 Merge "Use more variables from Soong" 2019-09-09 17:21:44 +00:00
Bowgo Tsai
65a1e72cd8 Merge "Moving emulator-specific properties to /system_ext"
am: b1374c9262

Change-Id: Iff60bed0ac8a7e9638bfeadbe8bc39bfd0a50f0e
2019-09-08 19:48:15 -07:00
Treehugger Robot
b1374c9262 Merge "Moving emulator-specific properties to /system_ext" 2019-09-09 02:33:19 +00:00