Commit Graph

50141 Commits

Author SHA1 Message Date
Bill Peckham
ec4b69a7d6 Merge "Add support merging system and other for the non-A/B configuration." am: 5f4186b000
am: a635376ce1

Change-Id: Ibdc6ec6facf44479f8ef0516988f9fc2fa1c7a53
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

Change-Id: I347d05f8a60c5f63ba591aed8d16b078bfdfb840
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
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

Change-Id: Iebf5cc3e43ef91f57948fb36b834eadd3b7d5591
2019-04-01 12:33:17 -07:00
Martin Stjernholm
683996193e Merge "Drop libsigchain from the system image."
am: c712ac1001

Change-Id: Ic7c2ad24c51069648155224ca2350ca91f613292
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

Change-Id: I5d10c1baa454ef7d94203bed3bfeba56f301d485
2019-04-01 09:38:12 -07:00
Yifan Hong
b2c5bdd9a5 Merge "Move super.img to obj/PACKAGING"
am: c2fe916233

Change-Id: I71deec3850e2bd7b8cb2b4cefe926d3f49f732e7
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

Change-Id: I4dc6f6aaa83dc6137e329deffa012d0e22f40e22
2019-04-01 07:05:02 -07:00
Bowgo Tsai
016e83a83a Merge "Adding gsk_keys.mk"
am: a719f02197

Change-Id: I3fd3963f3aa1041aec80c582f66559eb5d3ce771
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
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

Change-Id: I9880fdf0b3a242932b9402b384222f3d45e6d5cd
2019-03-29 10:12:06 -07:00
Anton Hansson
23919b3dd4 Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792
am: 15780ecbbb

Change-Id: I64ed86f6e27fd0da2058b832fc1fb277af0d490d
2019-03-29 10:11:13 -07:00
Anton Hansson
ffed666e07 Merge "Access PRODUCT_ variables directly"
am: 8adf501905

Change-Id: Ic22d18e3bba7bd2dc744978f8b004717a5737023
2019-03-29 10:08:00 -07:00
Anton Hansson
15780ecbbb Merge "Automate the strip and assignment of PRODUCT_ vars"
am: b5cec0d792

Change-Id: Ia916e2244b34b5f88a9065356a47615a01839a5d
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

Change-Id: Ief2749e8afa022d3a430dcd5ea376c2dee5496a1
2019-03-29 07:06:09 -07:00
Martin Stjernholm
4598286860 Merge "Make the APEX lib absence check optional, for local use."
am: 20ac920654

Change-Id: I076fa80c2a5496eaf0619a8c6a80fc77d698e0ee
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

Change-Id: Iddd840b1708d9ce8df4b171b58f12b29d5f8c1e1
2019-03-28 21:35:57 -07:00
Daniel Norman
d8414c71b8 Merge "Adds some tests for merge_target_files."
am: 482e67f4ee

Change-Id: I246a1e6f2afceb42a5aca56b46291fbd37860ac5
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

Change-Id: I11054d1c97426e30baafa97ec59bc5df45d27b39
2019-03-28 20:30:01 -07:00
Dan Willemsen
cc2155aa37 Merge "Stop installing host packages via PRODUCT_PACKAGES"
am: 672e98fac8

Change-Id: I0db73bc1f59b8f50f5529cbd0992fab9aa808a1b
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

Change-Id: I0604d288ab42f3a347b6f5de22d7fb4742f6ea05
2019-03-28 20:17:53 -07:00
SzuWei Lin
debaf1b8af Merge "Fix build error on empty ramdisk"
am: 5d225276ca

Change-Id: I4f550bbd49dbbeb90d2855c13fb066bcd33b8e4a
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
Daniel Norman
6d82fa3961 Adds some tests for merge_target_files.
Test: python -m unittest test_merge_target_files
Bug: 129262038
Change-Id: Ibcb3b384b81ceaa1924a6cd402a8880bd3cfbba6
2019-03-28 14:43:30 -07:00
Anton Hansson
8dab0a6f50 Access PRODUCT_ variables directly
This CL simplifies the PRODUCTS.$(INTERNAL_PRODUCT).X accesses of
product variables, and removes unnecessary stripping of them.

Replace: '\$\(PRODUCTS\.\$\(INTERNAL_PRODUCT\)\.([^\)]*)\)' with '$(\1)'
Replace: '\$\(strip\s*\$\(PRODUCT_([^\)]*)\)\)' with '$(PRODUCT_\1)'

A few minor manual tweaks.

Bug: 116769560
Test: presubmit
Change-Id: I70c54f1582e3cc780028535960147d99ebc2e0e1
2019-03-28 15:54:25 +00:00
Anton Hansson
13ea2a6a7d Automate the strip and assignment of PRODUCT_ vars
With this change, all PRODUCT_ variables are treated the same
when it comes to stripping and assigning them to their final
variable name. In the past, all the PRODUCT variables needed
to be listed in two places to achieve this.

The documentation previously attached to the strip/assignment
is moved to the PRODUCT_ variable list in product.mk.

Also refactor some of the default value logic to cope with
the new automation.

Many places in the build system that currently refer to
$(PRODUCTS.$(INTERNAL_PRODUCT).X) can now be modified to
use $(X) directly.

Bug: 116769560
Test: verified noop on PRODUCT_ variables on all products in the tree
Change-Id: I5677c355e81359b1d3c0db2a2232941097a05047
2019-03-28 15:26:49 +00:00
Martin Stjernholm
c9d5858f58 Make the APEX lib absence check optional, for local use.
Test: m systemimage (with and without failure)
Bug: 124293228
Bug: 129466457
Change-Id: I8bf5ba51232bb9961bdedd56d0f17ee1d8698f54
2019-03-28 15:08:32 +00:00
SzuWei Lin
29770fa2bf Fix build error on empty ramdisk
package `init_vendor` is the only content of ramdisk so far.
We would get build error if we do not include init_vendor.
The patch fix the build error for the case that ramdisk is empty.

Bug: 129386309
Test: lunch aosp_arm64_ab-userdebug; make ramdisk -j
Test: Build pass
Change-Id: I7c7c828b5f29350268d4789393b90740dd68162d
2019-03-28 13:41:01 +00:00
Colin Cross
2172041a44 Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f
am: d4ada79abd

Change-Id: Iec62861e620719e4a9601b5beee7208569954c5b
2019-03-27 11:25:16 -07:00
Colin Cross
d4ada79abd Merge "Understand the support library/androidx @Keep annotations"
am: 3f6483cb0f

Change-Id: I4997b8d4aa6799eb262453b09c0549a509dcc012
2019-03-27 11:21:37 -07:00
Treehugger Robot
3f6483cb0f Merge "Understand the support library/androidx @Keep annotations" 2019-03-27 18:01:28 +00:00
Tao Bao
bce744ef67 Merge "releasetools: Remove the sanity check on APEX payload key names." am: c292edc22c
am: ea673330bd

Change-Id: I4f8e9f1ff4ff7eddd75c6f94683c9f261456b098
2019-03-27 08:55:52 -07:00
Tao Bao
ea673330bd Merge "releasetools: Remove the sanity check on APEX payload key names."
am: c292edc22c

Change-Id: I3ff4de4afde65971f9967db73a6373107517c8fa
2019-03-27 08:51:33 -07:00
Tao Bao
c292edc22c Merge "releasetools: Remove the sanity check on APEX payload key names." 2019-03-27 15:44:29 +00:00
SzuWei Lin
c31910805e Merge "Phase out all _a targets" am: fde506a6d7
am: 969c3cd3ba

Change-Id: I0da3a732a5e5b2b6770e913c752c4e3523b2c106
2019-03-27 06:11:50 -07:00
SzuWei Lin
969c3cd3ba Merge "Phase out all _a targets"
am: fde506a6d7

Change-Id: I6d3935cad6fabf8d3d963af501d936432e1f0c19
2019-03-27 06:07:12 -07:00
Treehugger Robot
fde506a6d7 Merge "Phase out all _a targets" 2019-03-27 12:56:11 +00:00
SzuWei Lin
b90ffb0f9a Phase out all _a targets
The _a targets are build for Legacy GSI for non-system-as-root
partition layout devices. The Android build system is not able
to build a system image with non-system-as-root anymore.
Also, `init` supports mounting system-as-root system image at
all, all devices should no problem to mount it.

Bug: 124278972
Test: none
Change-Id: I9c56e7e5d8517a630854f030616c3b3ecb94b9a8
2019-03-27 12:16:43 +08:00
Tao Bao
06ee461ac2 Merge "releasetools: Re-enable verifying AVB-signed images." am: 5ed75d74e3
am: 26b2664dce

Change-Id: I371f9d13ccab077184d1bff105c29c20b1441458
2019-03-26 20:46:38 -07:00