Commit Graph

1413 Commits

Author SHA1 Message Date
Tao Bao
bce0264348 Merge "releasetools: img_from_target_files uses zip2zip."
am: f833a75283

Change-Id: I1731934e5585185167db9638c7b6652871fbf913
2019-08-30 12:29:42 -07:00
Tao Bao
57f8ed6b5e releasetools: img_from_target_files uses zip2zip.
Test: Build the following targets and check the built image archive.
      bonito-userdebug (contains flashable images);
      cf_x86_phone-userdebug (contains super.img);
      aosp_arm64-eng (contains VerifiedBootParams.textproto)
Test: m -j otatools-package; Check that zip2zip is included; Use
      bin/img_from_target_files to generate image archive.
Change-Id: I9f28765bd702849f0df309faebd6aa3072920536
2019-08-28 16:36:25 -07:00
Remi NGUYEN VAN
ff51a362fd Merge "Add a product build var for mainline module certs"
am: a7832d5543

Change-Id: I00c77685a3b630049a2f578258d54cdc6e973e3a
2019-08-15 01:11:22 -07:00
Treehugger Robot
a7832d5543 Merge "Add a product build var for mainline module certs" 2019-08-15 07:43:46 +00:00
Tao Bao
c1966a8bdd Makefile uses add_img_to_target_files module.
Also pack additional tools into otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
(cherry picked from commit 1cf8bf0c14)
2019-08-14 10:44:53 -07:00
Tao Bao
1cf8bf0c14 Makefile uses add_img_to_target_files module.
Also pack additional tools into otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: `m -j otatools-package`; Check the packed tools.
Change-Id: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
Merged-In: Ia21d143ca42b1cae8f04b5f0e0cdf6b719312117
2019-08-14 10:34:59 -07:00
Tao Bao
f882684d85 Merge "Move make_recovery_path and sparse_img to modules."
am: 4c9527b314

Change-Id: I13a67cfe58450696c37a0e7e4ecc3261d8bd7d5a
2019-08-07 13:15:15 -07:00
Remi NGUYEN VAN
87d0f2703f Add a product build var for mainline module certs
OEMs may need to have different device configurations that use different
signing configurations for mainline modules. The network stack mainline
module has a sepolicy context referencing its certificate, so the
generated plat_mac_permission.xml differs based on the module signing
configuration.

The added PRODUCT_MAINLINE_SEPOLICY_DEV_CERTIFICATES variable defines a
per-product directory for the certificates, so that which certificate to
use can be configured in the product makefile, instead of replacing the
certificate file itself.

This change is to be submitted together with another change in sepolicy
makefile.

Test: changed certificate path, m, verified plat_mac_permissions.xml has
      new certificate.
Bug: 134995443
Bug: 138097611

Change-Id: I863a9904d4a2ea2abad679ae0969d50e374f269d
2019-08-07 18:54:04 +09:00
Tao Bao
e11a46000c Move make_recovery_path and sparse_img to modules.
These two tools are only used within build system, so not adding them
to otatools.zip.

Bug: 63866463
Test: TreeHugger
Test: Build a non-A/B target that calls make_recovery_patch.
Change-Id: Iaeddc98a2c4a27c6b49d91047500029e460db9e3
2019-08-06 23:27:48 -07:00
Tao Bao
93d52312d3 Merge "Build and use ota_from_target_files as a module."
am: b7957f112b

Change-Id: I2c2d6d17f0b52c83a591ebe28b31076741b3e967
2019-08-06 11:00:19 -07:00
Tao Bao
8821d64481 Build and use ota_from_target_files as a module.
Bug: 63866463
Test: TreeHugger
Test: m -j otapackage
Test: `m -j otatools-package`. Check bin/ota_from_target_files is
      available. Build an OTA package with standalone otatools.
Change-Id: I533dee1c6997d233601e7f4eae637ff5743ed637
2019-08-05 12:57:41 -07:00
Dan Willemsen
58be946140 Merge changes from topic "rm_ONE_SHOT_MAKEFILE"
am: 8b8b9b6bf8

Change-Id: I5764b2ce848710584d2d837e9e33fb9fb71c8d33
2019-08-01 14:31:32 -07:00
Elliott Hughes
9dc7ad724f Merge "Remove PRODUCT_IOT."
am: 3c1bec04e0

Change-Id: I5a8d342ae43c478c164e89be49a1f5660a16a49b
2019-07-31 18:19:15 -07:00
Dan Willemsen
0df0f6bbf1 Remove [jni_]link_type files
Now that mm/ONE_SHOT_MAKEFILE have been removed, we can expect to know
about all of our dependencies at the end of the build.

This removes 19k nodes from our build graph (aosp-master
aosp_arm64-eng), though in a default build, only 3k of those are used.

Test: ALLOW_MISSING_DEPENDENCIES=true, then trigger a missing dependency
Test: treehugger
Test: create link_type files, then apply CleanSpec.mk, ensure they're removed
Change-Id: I9506331e4a9911d2f26e59a2f72a97aef1644073
2019-07-31 18:09:22 -07:00
Dan Willemsen
5c3fc2a792 Remove support for ONE_SHOT_MAKEFILE
Test: treehugger
Change-Id: Ie73418c186ec4c0e1c91078c133de8f8113295bf
2019-07-31 18:08:47 -07:00
Elliott Hughes
3c1bec04e0 Merge "Remove PRODUCT_IOT." 2019-08-01 00:32:04 +00:00
Dan Willemsen
93b7c1b547 Merge "Stop supporting wrapping the build with make"
am: d69e849c9b

Change-Id: If6e369f82348d9d7aebe37104072a6878f7281ea
2019-07-30 15:44:36 -07:00
Elliott Hughes
0548439172 Remove PRODUCT_IOT.
Test: treehugger
Change-Id: Ic214ebda6c65e7e51e39151b10f4ce965b35c121
2019-07-30 09:01:15 -07:00
Dan Willemsen
893948955d Stop supporting wrapping the build with make
The build servers are no longer using this. It's hard to search for
others using it -- I've cleaned them up as I've run across them, but
we'll just have to see who breaks once this goes in.

This was the last user of makeparallel, so we can remove it.

Test: make
Test: treehugger
Change-Id: If6df3f1a67d6a6df36afaa4b07cd88a48a364fe1
2019-07-29 22:43:35 -07:00
Ramy Medhat
42c010d0e2 Merge "Add RBE mk file to support bootstrapping RBE and setting relevant environment variables."
am: f7eb2f829c

Change-Id: I10d9c206a80d13b67c547a5955235caae625c59f
2019-07-23 05:19:31 -07:00
Ramy Medhat
f7eb2f829c Merge "Add RBE mk file to support bootstrapping RBE and setting relevant environment variables." 2019-07-23 11:49:10 +00:00
Elliott Hughes
4ef2129851 Merge "Remove unused BoardConfig variables."
am: 56bcff99a4

Change-Id: I9f2406879a242deddc66bdaf4b4608b5be12ffc6
2019-07-22 09:20:43 -07:00
Elliott Hughes
56bcff99a4 Merge "Remove unused BoardConfig variables." 2019-07-22 15:41:21 +00:00
Tao Bao
e8aa7dcf19 Merge "Build build_image and build_super_image as modules."
am: 25cf50f582

Change-Id: Idb34ce99b01fe432e0fe2f7824a87cc8fa3541bf
2019-07-19 07:40:39 -07:00
Elliott Hughes
2e6e73bb01 Remove unused BoardConfig variables.
Determined via codesearch.

Test: treehugger
Change-Id: I5138e1b2294d39e11b46f9e1751c41b842c1743b
2019-07-18 21:43:38 -07:00
Tao Bao
2bbb07c53c Build build_image and build_super_image as modules.
Bug: 63866463
Test: TreeHugger
Test: `atest releasetools_test`
Test: `atest releasetools_py3_test`
Change-Id: I2059a4ced709d1b2ee331a9aaaa5ca30db4ebf6b
2019-07-18 10:27:38 -07:00
Ramy Medhat
ec8b8dfa3e Add RBE mk file to support bootstrapping RBE and setting relevant
environment variables.

Test: Built aosp_arm-user with and without USE_RBE. With USE_RBE,
used a simple proxy script in place of rewrapper.

Change-Id: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
2019-07-17 14:22:00 +00:00
Elliott Hughes
7a45e0ccb9 Merge "Stop building unnecessary tarballs."
am: 9a4b84de56

Change-Id: I9465ce123bc1d5ab9662069af6181dd7382eff57
2019-07-12 08:10:05 -07:00
Elliott Hughes
440c99f1f2 Stop building unnecessary tarballs.
Test: treehugger
Change-Id: Iaba2aa6d09ad891f37171cc76778d08c78c78f93
2019-07-12 05:04:12 +00:00
Justin Yun
8f11ad5d40 Merge "Rename product_services to system_ext"
am: b7a50ece30

Change-Id: I7a56d76d3543b2bc4b1d0b24e54e8dd82ab7f15a
2019-07-09 02:14:55 -07:00
Justin Yun
6151e3f1ea Rename product_services to system_ext
Bug: 134359158
Test: build and check if system_ext.img is created
Change-Id: I67f2e95dd29eac6a28e07e24ea973d3a134c3bfc
2019-07-09 08:57:19 +00:00
TreeHugger Robot
218adad125 Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master" into stage-aosp-master 2019-07-02 07:40:58 +00:00
Tao Bao
48a2feb670 Change the condition for building super_empty.img.
This CL changes the condition for building super_empty.img from
PRODUCT_BUILD_SUPER_PARTITION to PRODUCT_USE_DYNAMIC_PARTITIONS, as a
follow-up to the change in [1].

With the CL in [1], it skips building super.img and super_empty.img both
when turning off PRODUCT_BUILD_SUPER_PARTITION. However, the latter
should be mandatory whenever dynamic partitions is enabled. Because
fastboot relies on this file to properly flash dynamic partitions. Plus,
the cost for building super_empty.img is much lower than the one for
super.img.

As part of the change, it'll write group info into target_files when
building with PRODUCT_BUILD_SUPER_PARTITION == false. It's the work for
target_files merging script to determine the values to be picked up. The
current logic in merge_target_files.py always uses the one from vendor
target_files. This CL adds a testcase to ensure the behavior.

[1] https://android-review.googlesource.com/c/platform/build/+/928756

Bug: 135752763
Test: `m dist` with a target that sets PRODUCT_BUILD_SUPER_PARTITION to
      false. Check the built artifacts contain super_empty.img. Verify
      that the build can be flashed properly.
Change-Id: I277f087eab45663a6c3b33333d16e9e576c1c25c
2019-06-28 14:23:53 -07:00
Tao Bao
b1b275873c Merge "Clean up the dependencies for user image creation." am: ec53f441fa
am: 8ae72adb4b

Change-Id: Ica87f15572d10b384e13436ec63572922df8de7c
2019-06-25 11:52:02 -07:00
Tao Bao
dba635a3b7 Clean up the dependencies for user image creation.
The dependency on MAKE_EXT4FS (mke2fs) has been covered by the rule for
MKEXTUSERIMG (mkuserimg_mke2fs):
https://android.googlesource.com/platform/system/extras/+/refs/heads/master/ext4_utils/Android.bp

The dependency on mksquashfs and img2simg comes from mksquashfsimage.sh,
which has been moved into mksquashfsimage's building rule.

This CL also fixes the ordering of INTERNAL_USERIMAGES_BINARY_PATHS,
which should come after adding all the binaries to
INTERNAL_USERIMAGES_DEPS.

Test: TreeHugger
Change-Id: I8b30bf87860d9711e88eecca4b76db72f5cd8241
2019-06-24 15:47:47 -07:00
Daniel Norman
c7c103514f Merge "Allows skipping building the super images for partial builds." am: 87ebb3013f
am: d3576727ea

Change-Id: I872f713f9f8ff30b3dd72643b07443894b5af451
2019-06-14 15:12:25 -07:00
Treehugger Robot
87ebb3013f Merge "Allows skipping building the super images for partial builds." 2019-06-14 21:42:33 +00:00
Daniel Norman
0bf940cace Allows skipping building the super images for partial builds.
Previously, setting PRODUCT_BUILD_SUPER_PARTITION to false for a partial
build (with PRODUCT_USE_DYNAMIC_PARTITIONS == true) would fail to
include necessary keys in misc_info.txt that are required when merging
two partial builds to create a dynamic-partition-enabled mixed build.

This change ensures these necessary keys are included even when
PRODUCT_BUILD_SUPER_PARTITION is false. Setting
PRODUCT_BUILD_SUPER_PARTITION to false causes partial builds to skip
building super.img and super_empty.img, instead relying on these images
to come from the final merged build.

Bug: 134764140
Test: Building & booting a dynamic-partition-enabled mixed build, and
inspecting partial builds' logs / out folder to ensure that
super.img/super_empty.img were not created.

Change-Id: I99431a9a342e9b0617510e250597f3024ef39322
2019-06-14 11:42:45 -07:00
Dan Willemsen
3b37c4cad4 Merge "Add missing dependencies to python scripts" am: 56bfae6402
am: 083777a4c9

Change-Id: I791359b0acebb29402c8ebb922c0a3b30717889c
2019-06-10 20:37:40 -07:00
Dan Willemsen
c84e4cb917 Add missing dependencies to python scripts
These were found when trying to run remotely on RBE with only the
sources depended upon available for each rule.

Bug: 130111713
Test: treehugger
Change-Id: Id763f8fc7dfbe60445f98604db3422147165f537
2019-06-10 23:58:49 +00:00
Tri Vo
afa741aaca Merge "Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" am: f4a8b6415f
am: f61d6b97dd

Change-Id: Ic6f3a7196f8b3e5b6801e63142f8bacaf99a4d52
2019-06-03 13:36:55 -07:00
Tri Vo
790db2fc79 Reland "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"
Bug: 133196056
Test: m selinux_policy
Change-Id: I194167cc33ed9b0367dd3edfd5d954af5c1b4a13
2019-06-01 17:06:07 -07:00
Tao Bao
0fa45c308b Merge "Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL." am: f4d18a0d11
am: 91dda1066d

Change-Id: Ib5e242a2721a3d4b89f9065e3d5daf4bc0ab47e1
2019-05-30 10:17:09 -07:00
Tao Bao
84f88a473a Obsolete PRODUCT_STATIC_BOOT_CONTROL_HAL.
Bug: 34254109
Test: TreeHugger
Test: Define PRODUCT_STATIC_BOOT_CONTROL_HAL and see the expected
      failure after lunch.
Change-Id: I914b84e874fe14a25dcfe56b282c56f88934d07c
2019-05-29 11:38:16 -07:00
Dan Willemsen
bf5ce84a87 Merge changes from topic "rm_export" am: e246508e95
am: e09ef6ad2d

Change-Id: I8d82fa52e8043a0d4ecfd6b3762e63e2d17c4aa9
2019-05-28 18:30:22 -07:00
Tri Vo
d1d4eb15bd Merge "Revert "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" am: 10d4c5066c
am: 0b5b966fc7

Change-Id: I0badda4d319e45446b3f24d6ddfd9e139e2061d1
2019-05-28 18:29:10 -07:00
Treehugger Robot
e246508e95 Merge changes from topic "rm_export"
* changes:
  Mark more BUILD_* as obsolete
  Obsolete BUILD_BROKEN_ANDROIDMK_EXPORTS
2019-05-29 01:17:01 +00:00
Tri Vo
10d4c5066c Merge "Revert "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"" 2019-05-29 01:12:15 +00:00
Tri Vo
02ae68ea63 Revert "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS"
This reverts commit bdd494aaa6.

Reason for revert: breaks build

Change-Id: I971f0feee3b23754f3c0f9edec05fb3ddfb737c3
2019-05-29 01:00:56 +00:00
Tri Vo
6ab285c407 Merge "Add 29.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 355a45a8de
am: 4af66c9caa

Change-Id: I6315bba2af349378e259a1eeb22e9e6979f59826
2019-05-28 17:17:51 -07:00