Tao Bao
013c86f4fc
Merge "releasetools: Update the embedded AVB pubkey in an APEX." am: 289fa3cea3
...
am: a24aecb821
2019-04-02 10:34:12 -07:00
Colin Cross
b4fd03b3fc
[automerger skipped] Merge "Remove media_cmd from product packages" am: 00d8c4b64e am: fef973ecc4
...
am: 23a8ddda67a13f3750f4
2019-04-02 10:30:57 -07:00
Tao Bao
a24aecb821
Merge "releasetools: Update the embedded AVB pubkey in an APEX."
...
am: 289fa3cea3
2019-04-02 10:22:53 -07:00
Colin Cross
23a8ddda67
Merge "Remove media_cmd from product packages" am: 00d8c4b64e
...
am: fef973ecc4
2019-04-02 10:13:10 -07:00
Tao Bao
289fa3cea3
Merge "releasetools: Update the embedded AVB pubkey in an APEX."
2019-04-02 16:56:45 +00:00
Colin Cross
fef973ecc4
Merge "Remove media_cmd from product packages"
...
am: 00d8c4b64e
2019-04-02 09:54:16 -07:00
Colin Cross
00d8c4b64e
Merge "Remove media_cmd from product packages"
2019-04-02 16:39:04 +00:00
Bill Peckham
f4f3007461
Merge "Add support merging system and other for the non-A/B configuration." am: 5f4186b000 am: a635376ce1
...
am: ec4b69a7d6
2019-04-02 06:35:21 -07:00
Bill Peckham
ec4b69a7d6
Merge "Add support merging system and other for the non-A/B configuration." am: 5f4186b000
...
am: a635376ce1
2019-04-02 06:28:56 -07:00
Bill Peckham
a635376ce1
Merge "Add support merging system and other for the non-A/B configuration."
...
am: 5f4186b000
2019-04-02 06:24:25 -07:00
Bill Peckham
5f4186b000
Merge "Add support merging system and other for the non-A/B configuration."
2019-04-02 13:15:17 +00:00
Tao Bao
9c0f443264
releasetools: Update the embedded AVB pubkey in an APEX.
...
APEX keys are now embedded in the APEX [1].
[1] https://android-review.googlesource.com/c/platform/system/apex/+/936942
Fixes: 128297564
Test: Run sign_target_files_apks.py on a target_files.zip built with the
CL above.
Change-Id: I219cc3e6ce6f652537fcc37322c8902f295c1447
2019-04-01 21:30:07 -07:00
Bill Peckham
364c1ccaa5
Add support merging system and other for the non-A/B configuration.
...
For non-A/B, you must supply the --system-item-list, --other-item-list, and
--system-misc-info-keys parameters approrpriate for merging two partial target
files. Additionally, you must supply the --rebuild-recovery option to correctly
generate the filesystem config and file contexts. With all of these parameters,
the script will generate a merged target files containing the correct recovery
files.
Also fix the --keep-tmp option to be consistent with the other options.
Bug: 122813742
Test: verify that merged target image boots and can perform OTA.
Change-Id: I5a942ac0cd9924fec419a686794a2340304594c8
2019-04-01 14:55:33 -07:00
Martin Stjernholm
ff2f484864
Merge "Drop libsigchain from the system image." am: c712ac1001 am: 683996193e
...
am: 11eb0df260
2019-04-01 12:37:25 -07:00
Martin Stjernholm
11eb0df260
Merge "Drop libsigchain from the system image." am: c712ac1001
...
am: 683996193e
2019-04-01 12:33:17 -07:00
Martin Stjernholm
683996193e
Merge "Drop libsigchain from the system image."
...
am: c712ac1001
2019-04-01 12:28:04 -07:00
Martin Stjernholm
c712ac1001
Merge "Drop libsigchain from the system image."
2019-04-01 19:15:25 +00:00
Martin Stjernholm
f8b6fefcd1
Drop libsigchain from the system image.
...
It is now in the Runtime APEX and considered internal there.
Test: Flash and boot
Test: atest CtsCompilationTestCases CtsBionicTestCases
Bug: 118374951
Bug: 124293228
Change-Id: I33bb9c238d7db46795deb592c9d20fe6591c1654
2019-04-01 18:37:06 +01:00
Yifan Hong
7a8ffbeb9f
resolve merge conflicts of 7bd8a3692f to master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I16278376fb4a2b26f15b675016d00819ea99c296
2019-04-01 09:53:23 -07:00
Yifan Hong
7bd8a3692f
Merge "Move super.img to obj/PACKAGING" am: c2fe916233
...
am: b2c5bdd9a5
2019-04-01 09:38:12 -07:00
Yifan Hong
d89aacf6d5
Add libcgrouprc.so to LL-NDK
...
Bug: 123664216
Test: builds
Change-Id: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
2019-04-01 09:36:31 -07:00
Yifan Hong
b2c5bdd9a5
Merge "Move super.img to obj/PACKAGING"
...
am: c2fe916233
2019-04-01 09:35:02 -07:00
Treehugger Robot
c2fe916233
Merge "Move super.img to obj/PACKAGING"
2019-04-01 16:21:07 +00:00
Bowgo Tsai
8859e60fd7
Merge "Adding gsk_keys.mk" am: a719f02197 am: 016e83a83a
...
am: f3e70324f1
2019-04-01 07:14:08 -07:00
Bowgo Tsai
f3e70324f1
Merge "Adding gsk_keys.mk" am: a719f02197
...
am: 016e83a83a
2019-04-01 07:05:02 -07:00
Bowgo Tsai
016e83a83a
Merge "Adding gsk_keys.mk"
...
am: a719f02197
2019-04-01 06:59:45 -07:00
Treehugger Robot
a719f02197
Merge "Adding gsk_keys.mk"
2019-04-01 13:43:34 +00:00
Anton Hansson
5aa8db53a2
Add more product defaults to mainline.mk
...
Replicate aosp_blueline's configuration, which is shared with other
pixels, and explicitly repurpose this to be a generic AOSP mainline
device.
Clean up associated whitelist entries in gsi for the apps I'm
moving to /product in the same topic.
Bug: 129077057
Test: boot aosp_blueline
Test: browse ringtones
Change-Id: I8424cb23923987d2176369f93b479fc827fbabef
2019-04-01 13:24:38 +01:00
Bowgo Tsai
a0e177edba
Adding gsk_keys.mk
...
Adds the following line into a device.mk in order to include
GSI keys into the first-stage ramdisk.
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)
Bug: 112293933
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8e4a9a8dd607916a3f45a07e0ba14c58def5d8d3
2019-04-01 18:24:35 +08:00
Jiwen Cai
c03e3c9341
Merge "Remove android.frameworks.bufferhub@1.0-service"
2019-03-31 23:37:44 +00:00
Colin Cross
61f950398a
Merge "Remove media_cmd from product packages"
2019-03-30 00:45:05 +00:00
Colin Cross
c20033f974
Remove media_cmd from product packages
...
The jar for the media command line tool is now installed as a
dependency of the media package.
Bug: 122332340
Test: lunch generic-eng && m nothing
Change-Id: I15ef7cb373ff249887f5641ca9c9722bfc3263a2
Merged-In: I15ef7cb373ff249887f5641ca9c9722bfc3263a2
2019-03-29 16:35:06 -07:00
Yifan Hong
5478754cd6
Move super.img to obj/PACKAGING
...
To avoid the confusion. super.img isn't intended to be flashed
during day-to-day development.
Test: m superimage
Bug: 128891161
Change-Id: I9d62e5929b415343b2d890ab21e6ae51175af2ae
2019-03-29 14:47:28 -07:00
Jiwen 'Steve' Cai
eee1046b50
Remove android.frameworks.bufferhub@1.0-service
...
Disable this for Q. We will add this back once Q branches.
Bug: 128320950
Bug: 123429755
Test: Build system
Change-Id: I1d360c7a8890148be6197092ba149203a72a019d
2019-03-29 11:51:42 -07:00
Colin Cross
a13f3750f4
Remove media_cmd from product packages
...
The jar for the media command line tool is now installed as a
dependency of the media package.
Bug: 122332340
Test: lunch generic-eng && m nothing
Change-Id: I15ef7cb373ff249887f5641ca9c9722bfc3263a2
2019-03-29 11:04:19 -07:00
Anton Hansson
cf0b72a241
Merge "Access PRODUCT_ variables directly" am: 8adf501905 am: ffed666e07
...
am: 9ff3ac88c6
2019-03-29 10:16:52 -07:00
Anton Hansson
2abc1dcb64
Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792 am: 15780ecbbb
...
am: 23919b3dd4
2019-03-29 10:15:44 -07:00
Anton Hansson
9ff3ac88c6
Merge "Access PRODUCT_ variables directly" am: 8adf501905
...
am: ffed666e07
2019-03-29 10:12:06 -07:00
Anton Hansson
23919b3dd4
Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792
...
am: 15780ecbbb
2019-03-29 10:11:13 -07:00
Anton Hansson
ffed666e07
Merge "Access PRODUCT_ variables directly"
...
am: 8adf501905
2019-03-29 10:08:00 -07:00
Anton Hansson
15780ecbbb
Merge "Automate the strip and assignment of PRODUCT_ vars"
...
am: b5cec0d792
2019-03-29 10:07:04 -07:00
Anton Hansson
8adf501905
Merge "Access PRODUCT_ variables directly"
2019-03-29 16:54:47 +00:00
Anton Hansson
b5cec0d792
Merge "Automate the strip and assignment of PRODUCT_ vars"
2019-03-29 16:54:25 +00:00
Martin Stjernholm
480ab2ad7c
Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654 am: 4598286860
...
am: 9791a3c4d7
2019-03-29 07:10:20 -07:00
Martin Stjernholm
9791a3c4d7
Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654
...
am: 4598286860
2019-03-29 07:06:09 -07:00
Martin Stjernholm
4598286860
Merge "Make the APEX lib absence check optional, for local use."
...
am: 20ac920654
2019-03-29 07:01:58 -07:00
Treehugger Robot
20ac920654
Merge "Make the APEX lib absence check optional, for local use."
2019-03-29 13:43:32 +00:00
Daniel Norman
b2852ae287
Merge "Adds some tests for merge_target_files." am: 482e67f4ee am: d8414c71b8
...
am: 1abb3e3371
2019-03-28 21:39:10 -07:00
Daniel Norman
1abb3e3371
Merge "Adds some tests for merge_target_files." am: 482e67f4ee
...
am: d8414c71b8
2019-03-28 21:35:57 -07:00
Daniel Norman
d8414c71b8
Merge "Adds some tests for merge_target_files."
...
am: 482e67f4ee
2019-03-28 21:30:49 -07:00
