Commit Graph

27122 Commits

Author SHA1 Message Date
Martin Stjernholm
43747aafb1 Force building ART from source for AOSP products.
This is a workaround for the problem that we cannot control from make
which APEX gets picked for deapexing.

Test: env TARGET_PRODUCT=aosp_cf_x86_64_phone \
          SOONG_CONFIG_art_module_source_build=false \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  This shows true
Test: env TARGET_PRODUCT=cf_x86_64_phone \
          SOONG_CONFIG_art_module_source_build=false \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  This shows false
Bug: 192006406
Bug: 172480615
Change-Id: I8990b726affeb08eabf130d20be45129a7c1c58d
2021-06-29 19:26:31 +01:00
Dario Freni
14abe199e2 Merge "Add MODULE_BUILD_FROM_SOURCE env variable." into sc-dev 2021-06-25 13:53:41 +00:00
TreeHugger Robot
1e6044e5da Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev 2021-06-24 23:59:05 +00:00
Dario Freni
84d3bf7a2f Add MODULE_BUILD_FROM_SOURCE env variable.
When set, module builds will prefer source where applicable.

Bug: 191978129
Test: m; MODULE_BUILD_FROM_SOURCE=true m
Change-Id: Ie7f928674a511a98f17653fa814a42194ee0e9f9
Merged-In: Ie7f928674a511a98f17653fa814a42194ee0e9f9
2021-06-24 17:37:50 +00:00
Jeongik Cha
5612cff4b4 Emit DexPreoptImageLocationsOnDevice as well
Bug: 158843648
Test: check if dexpreopt config for the module defined in mk has
DexPreoptImageLocationsOnDevice field.

Change-Id: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
Merged-In: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
(cherry picked from commit 242c436242)
2021-06-24 13:14:29 +00:00
Inseob Kim
94b0556c4e Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Bug: 190974433
Test: build
Change-Id: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
Merged-In: I2a0daa6127e94366b7b6cfa5cec0080169a469e3
2021-06-23 04:39:04 +00:00
Inseob Kim
f3897b668d Directly create ramdisk dirs in ramdisk image rule
These directories have been created with post install cmds of
init_first_stage. To migrate init_first_stage to Soong, the directory
rules are now written directly in ramdisk image rule.

Bug: 187196593
Test: "m installclean; m" and see ramdisk output
Change-Id: Ic76c325ce102347f20b282572e3edbb5b4359aaf
Merged-In: Ic76c325ce102347f20b282572e3edbb5b4359aaf
2021-06-23 04:38:55 +00:00
Inseob Kim
a9af042d58 Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
It'll be used from init_first_stage.

Bug: 187196593
Test: build
Change-Id: I4c5374debd56fbf9d11b456498835a9c411d01d6
Merged-In: I4c5374debd56fbf9d11b456498835a9c411d01d6
2021-06-23 04:33:18 +00:00
Devin Moore
36b659550e Revert "Throw an error if androidboot.hardware is used for bootconfig"
This reverts commit 2e43e34d53.

The kernel bootconfig feature has been updated to handle mixed subkeys
and values, so androidboot.hardware is ok to use now.

Test: build and boot cuttlefish with 'hardware=cutf_vm'
Test: build and boot cuttlefish with 'androidboot.hardware=cutf_vm'
Bug: 191502832
Merged-In: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
2021-06-21 12:48:24 -07:00
TreeHugger Robot
c66099dcc6 Merge changes Ie63d08ac,Ia7f8200c into sc-dev
* changes:
  Fix typo in droidcore-unbundled.
  Introduce droidcore-unbundled target
2021-06-17 15:01:07 +00:00
Bill Peckham
184524a915 Fix typo in droidcore-unbundled.
Test: manual inspection.
Bug: 191304308
Change-Id: Ie63d08acff0b9accfafd906a43bd18cbef5471a3
2021-06-17 03:33:09 +00:00
TreeHugger Robot
6e2acf1c60 Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev 2021-06-16 20:48:16 +00:00
Bill Peckham
315b98a73a Introduce droidcore-unbundled target
The droidcore-unbundled target replaces the droidcore
target when TARGET_BUILD_UNBUNDLED_IMAGE=true. This
target is similar to droidcore in terms of dependencies,
but it has a smaller set of dist files. The intention is
to use TARGET_BUILD_UNBUNDLED_IMAGE=true with a
VSDK-using vendor build to supply Java dependencies from
prebuilts to avoid building (or needing) Java framework
sources.

Test: build with and without TARGET_BUILD_UNBUNDLED_IMAGE=true
Test: m nothing dist (before patch)
Test: m nothing dist (after patch)
Test: m nothing dist TARGET_BUILD_UNBUNDLED_IMAGE=true (after patch)
Test: examine ninja build graph for previous 3 tests
Bug: 188176942
Bug: 187064252
Change-Id: Ia7f8200c1bb1aaaa57c177d1698a114efe26bec7
(cherry picked from commit 0a30cc41bc)
2021-06-16 19:54:07 +00:00
Jeff Sharkey
4ef2e34cb5 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev 2021-06-15 03:51:43 +00:00
Kelvin Zhang
9b55885314 Add ro.vendor.build.dont_use_vabc to disable VABC OTA
This prop is owned by OEM, OEM can set this if they want to disable
VABC.

Test: m dist, make sure generated OTA has VABC disabled
Bug: 185400304

Change-Id: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
Merged-In: Iceb2fb1f399d38a51722352a86ddf68af05fa24e
2021-06-14 15:38:37 -07:00
Paul Scovanner
073480991e Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
2021-06-14 21:56:38 +00:00
Paul Scovanner
7e1e5ad8ff Update Security String to 2021-08-05 am: f5139e3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Icbeccbd10e0496e7a38720f165b0868954939a51
2021-06-14 21:39:09 +00:00
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 18:53:26 +00:00
Jeff Sharkey
25d421446d [DO NOT MERGE] platform/build/make - S is now REL
Bug: 171506470
Test: Build
Change-Id: I98536ff83aab23cfaf5553a57a8a3b8264878847
2021-06-10 15:05:11 -06:00
Jaegeuk Kim
6279b6c511 Merge "Missing required packages for f2fs when building ota package" into sc-dev 2021-06-09 16:50:29 +00:00
Jaegeuk Kim
01da65f93a Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
Merged-In: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-09 02:11:23 +00:00
TreeHugger Robot
1efb38582a Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" into sc-dev 2021-06-07 00:57:19 +00:00
Jeongik Cha
5b1d149586 RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
Merged-In: I94e3122372dd20c942b2c858070a6ca797312792
(cherry picked from commit f93c13d51b)
2021-06-04 00:05:55 +00:00
Yuntao Xu
ee58bb67a5 add LOCAL_DISABLE_TEST_CONFIG logic
Disable the generation of .config file when the variable
LOCAL_DISABLE_TEST_CONFIG is true.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
Merged-In: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
2021-06-03 10:22:53 -07:00
Tianjie Xu
b195f48ce9 Merge "Check super size for factory OTA at build time" into sc-dev 2021-06-02 21:53:36 +00:00
Jeff Sharkey
83ecfb5073 Merge "platform/build/make - S is now 31" into sc-dev 2021-06-02 20:11:14 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Jaegeuk Kim
bce364b9ce Merge changes from topic "f2fs-system" into sc-dev
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-06-01 18:09:07 +00:00
Bowgo Tsai
22fb8a4709 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" into sc-dev 2021-05-28 00:35:40 +00:00
Tianjie
16bcac122f Check super size for factory OTA at build time
For VAB launched device, factory OTA will write system_other
partition to the super image. So we want to check that
sum(dynamic partitions) + system_other + overhead <= super at
build time.

Since we don't know the overhead at build time, we might instead
check sum(all partitions) < super.

Bug: 185809374
Test: m check-all-partition-sizes, unittests
Change-Id: Ia7ba5999d23924a1927e9a9463856a4d0ea90c20
Merged-In: Ia7ba5999d23924a1927e9a9463856a4d0ea90c20
(cherry-picked from commit 294ec7d9e5)

Change-Id: I479d1b399a1639b595ae5d7f1481c771a3439e51
2021-05-26 14:43:35 -07:00
Jaegeuk Kim
91869cafe6 Enable f2fs compression for other partitions
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I231f7a2b808cc792fd582cd444825e4a47722984
2021-05-26 13:11:28 -07:00
TreeHugger Robot
e9e08e9e91 Merge "[memtag] Disable memtag for AndroidMk host modules." into sc-dev 2021-05-26 17:27:49 +00:00
Mitch Phillips
fe35441af5 [memtag] Disable memtag for AndroidMk host modules.
BUILD_HOST_EXECUTABLE modules are substantially deprecated, but some
partners are still using them for their bits with the workaround
provided in the product definition. This fixes a build error where
the host module doesn't have a linkable ELF note archive.

MTE is not intended for host modules, and it's fine for us to say
"host module using AndroidMk - no MTE for you" if this changes.

Bug: 189330992
Test: Manually tested using a BUILD_HOST_EXECUTABLE module.
Change-Id: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
Merged-In: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
2021-05-26 17:07:27 +00:00
Bowgo Tsai
b23656df31 Support AVB signing for BOARD_PREBUILT_BOOTIMAGE
Devices using GKI architecture will use a prebuilt boot.img.
However, we should still sign this prebuilt boot.img with
device-specific AVB keys.

Steps to test the CL.
1. In a device BoardConfig.mk:

   # Uses a prebuilt boot.img
   TARGET_NO_KERNEL := true
   BOARD_PREBUILT_BOOTIMAGE := device/google/redbull/boot.img

   # Enable chained vbmeta for the boot image.
   # The following can be absent, where the hash descriptor of the
   # 'boot' partition will be stored then signed in vbmeta.img instead.
   BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
   BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096
   BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
   BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2

2. `make bootimage`, then `avbtool info_image --image $OUT/boot.img`,
    checks the image is re-signed with a device-specific key

3. `make dist` to generate out/dist/TF.zip

4. `unzip out/dist/TF.zip IMAGES/boot.img`

5. `avbtool info_image --image out/dist/IMAGES/boot.img`,
    checks the image is re-signed with a device-specific key

6. `sign_target_files_apks \
      --avb_boot_key=external/avb/test/data/testkey_rsa8192.pem \
      --avb_boot_algorithm=SHA256_RSA8192 \
      --avb_boot_extra_args="--prop test:sign" \
      ./out/dist/*-target_files-eng.*.zip signed.zip`, resign the TF.zip

7. `unzip signed.zip IMAGES/boot.img`, then use `avbtool info_image` to
   check the boot.img is re-signed with the --avb_boot_key in step 6.

Bug: 188485657
Test: above steps
Change-Id: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
Merged-In: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
(cherry picked from commit cf9ead8972)
2021-05-26 09:11:00 +08:00
Ulya Trafimovich
da5c795604 Disable <uses-library> checks for more tests (to fix MTS builds).
Bug: 132357300
Bug: 188648210
Fixes: 188907662
Test: lunch aosp_cf_x86_64_phone-userdebug && m mts && m gts
Change-Id: Iae0ecac076b351b2da929bb455f00f03ece130bd
(cherry picked from commit d5e6a7c620)
2021-05-24 06:23:47 -07:00
Paul Scovanner
b8ae2c21e1 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: Ie542698aef33599bf1e0d5315b58d2fcffada1d4
2021-05-19 22:42:09 +00:00
Paul Scovanner
e580c75611 Update Security String to 2021-07-05 am: 64b00db8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I89b530d9df421db3da5e3da15a38036255cda4bb
2021-05-19 22:25:31 +00:00
Ulyana Trafimovich
235f1507e9 Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-18 12:57:38 +00:00
Paul Scovanner
64b00db8f4 Update Security String to 2021-07-05
Bug: 188458861
Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-17 21:54:30 +00:00
Ulyana Trafimovich
d1d8c7133c Revert^6 "Enforce <uses-library> check for Android.mk modules."
This reverts commit 80e99d8851.

Reason for revert: relanding CL after fixing barbet-userdebug build.

Bug: 132357300
Change-Id: I4b8e22847215b349393f01f6c0a90dd03b6073cd
Test: on branch sc-dev: lunch barbet-userdebug && m
2021-05-17 09:36:52 +00:00
Bowgo Tsai
b9af035ee7 BOARD_PREBUILT_BOOTIMAGE: removes the restriction of non system-as-root
Starting from Android 10, the system.img layout consists of
$TARGET_SYSTEM_OUT and $TARGET_ROOT_OUT, and is mounted by the
init as root. That is, system.img is always created as if
BOARD_BUILD_SYSTEM_ROOT_IMAGE was set.

  https://source.android.com/devices/bootloader/partitions/system-as-root

The previous concern is that there might be compatibility issues between
the ramdisk contained in boot.img with a newer system.img. But this is
no longer an issue after we always mount the system.img as root.

Bug: 187157581
Test: Tree Hugger
Change-Id: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
Merged-In: I4537e6ce6fb39b4b86caac82a13716abf515ffd6
(cherry picked from commit 640544bd96)
2021-05-17 14:51:16 +08:00
Ulyana Trafimovich
6eac4c2236 Merge "Revert^5 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 17:44:21 +00:00
Ulyana Trafimovich
80e99d8851 Revert^5 "Enforce <uses-library> check for Android.mk modules."
This reverts commit d6057adc0b.

Reason for revert: broken build git_master/barbet-userdebug @ 7362593

Change-Id: I5549aa949ccbead2c7fa3e933db50b6d74f5990e
2021-05-14 17:34:09 +00:00
Ulyana Trafimovich
67fac6584e Merge "Revert^4 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-14 16:28:55 +00:00
Ulyana Trafimovich
d6057adc0b Revert^4 "Enforce <uses-library> check for Android.mk modules."
This reverts commit ad645285a6.

Reason for revert: relanding CL after fixing git_sc-car-dev builds and
  other build failures.

Bug: 132357300
Test: on branch sc-dev: lunch seahawk-userdebug && m
Test: on branch sc-dev: lunch osprey-userdebug && m
Test: on branch sc-dev: lunch factory_pipit-userdebug && m
Test: on sc-dev: lunch cf_x86_phone-userdebug && m droid dist tests
Test: forrest build partner-s-d1-fs-dev-slider/aosp_slider-userdebug:
  https://android-build.googleplex.com/builds/forrest/run/L22600000889121228
Change-Id: I74789903bd91d3bb45c69031fcbaf3556cb29408
2021-05-14 16:25:34 +00:00
Jaewoong Jung
c3eb4ba8b1 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4 am: b8781f9670
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I303106c1dd2da73789e08be3b6170b09066a74c9
2021-05-14 15:58:08 +00:00
Jaewoong Jung
b8781f9670 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7 am: ff4544ceb4
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: I2ee3b84f4edf4af08821c8feece944cc84c62fb1
2021-05-14 15:18:26 +00:00
Jaewoong Jung
ff4544ceb4 Merge "Do not alter presigned prebuilt apks for SDK > 29." am: 3218d79aa7
Original change: https://android-review.googlesource.com/c/platform/build/+/1705710

Change-Id: Ibb6585eca9474b783762343f0ab9f9302a7becb0
2021-05-14 14:31:22 +00:00
Jaewoong Jung
3218d79aa7 Merge "Do not alter presigned prebuilt apks for SDK > 29." 2021-05-14 14:07:17 +00:00
Anthony Hugh
b961222c08 Merge "Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""" into sc-dev 2021-05-14 04:40:15 +00:00