Nicolas Geoffray
719b51b400
Merge "Re-order the ext/framework boot jars in bootclasspath." am: 31a7dee48b
...
am: 2c142f1178
2019-04-03 01:15:27 -07:00
Nicolas Geoffray
2c142f1178
Merge "Re-order the ext/framework boot jars in bootclasspath."
...
am: 31a7dee48b
2019-04-03 01:06:19 -07:00
Nicolas Geoffray
31a7dee48b
Merge "Re-order the ext/framework boot jars in bootclasspath."
2019-04-03 07:27:55 +00:00
Dan Willemsen
d800adb979
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES" am: 9e4e30e219
...
am: 7954503ea1
2019-04-02 19:34:39 -07:00
Dan Willemsen
7954503ea1
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES"
...
am: 9e4e30e219
2019-04-02 19:24:45 -07:00
Treehugger Robot
9e4e30e219
Merge "Remove a few entries from PRODUCT_HOST_PACKAGES"
2019-04-03 02:01:56 +00:00
Dan Willemsen
a15c3a838d
Remove a few entries from PRODUCT_HOST_PACKAGES
...
adbd shouldn't be needed on the host in most cases
selinux_policy_system is a device PHONY_PACKAGE that will stop working
soon in PRODUCT_HOST_PACKAGES. I talked to jeffv and he's fine removing
it for now, adding back individual binaries if desired, or creating a
new host PHONY_PACKAGE.
shell_and_utilities_system is a similar device phony module. enh is fine
with it not being installed on the host by default for now, and we can
add them back as needed.
Test: treehugger
Change-Id: I1938f9f4ea5dbea2905baaf301473b617de9c530
2019-04-02 16:03:28 -07:00
Nicolas Geoffray
bfe65c6a1b
Re-order the ext/framework boot jars in bootclasspath.
...
Order of those doesn't matter, and the new order simplifies b/119800099.
Test: m and boots
Bug: 119800099
Change-Id: I9667a8d49ae751dfe713e37483548a58dfb25bd4
2019-04-02 17:56:07 +00:00
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
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
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
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
7bd8a3692f
Merge "Move super.img to obj/PACKAGING" am: c2fe916233
...
am: b2c5bdd9a5
2019-04-01 09:38:12 -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
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
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
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
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
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
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
Treehugger Robot
482e67f4ee
Merge "Adds some tests for merge_target_files."
2019-03-29 04:16:57 +00:00
Dan Willemsen
7e8cc8ce6c
Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8
...
am: cc2155aa37
2019-03-28 20:30:01 -07:00
Dan Willemsen
cc2155aa37
Merge "Stop installing host packages via PRODUCT_PACKAGES"
...
am: 672e98fac8
2019-03-28 20:25:48 -07:00
Dan Willemsen
672e98fac8
Merge "Stop installing host packages via PRODUCT_PACKAGES"
2019-03-29 03:20:52 +00:00
SzuWei Lin
3e3c738d7f
Merge "Fix build error on empty ramdisk" am: 5d225276ca
...
am: debaf1b8af
2019-03-28 20:17:53 -07:00
SzuWei Lin
debaf1b8af
Merge "Fix build error on empty ramdisk"
...
am: 5d225276ca
2019-03-28 20:13:43 -07:00
Treehugger Robot
5d225276ca
Merge "Fix build error on empty ramdisk"
2019-03-29 03:03:00 +00:00
