Commit Graph

27340 Commits

Author SHA1 Message Date
Martin Stjernholm
c9a802862f Merge "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)." into sc-dev 2021-07-07 12:12:33 +00:00
TreeHugger Robot
7e2e4be86c Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev
* changes:
  Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
  Revert "Directly create ramdisk dirs in ramdisk image rule"
  Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
2021-07-07 03:02:00 +00:00
Martin Stjernholm
6a3fd20b35 DO NOT MERGE: Use prebuilts of the ART Module by default (reland).
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

This relands http://ag/13552665 after updating ART prebuilts
(ag/15189174, ag/15200785). Using DO NOT MERGE to have the same scope
as they do.

Test: presubmits
Test: vendor/google/build/build_mainline_modules.sh
  with a line
    build/soong/soong_ui.bash --dumpvar-mode \
      SOONG_CONFIG_art_module_source_build
  directly before the module build commands in
  build_unbundled_mainline_module.sh and check that it's still true.
Bug: 192542393
Change-Id: I6281ef27bf9cdcb2ad5112b8a0932e4201d69dc2
2021-07-05 01:21:54 +01:00
Paul Scovanner
28bb26cec7 Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f am: abecfaa90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: Id32d0b6aa4a12afd336ed79b1dc61e0cc4c96065
2021-07-01 23:51:19 +00:00
Paul Scovanner
abecfaa90f Update Security String to 2021-09-01 am: 639164b255 am: 996d1d3a4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: I78b8f8bf0fb3dd657b1cef238395d8aa73784cbe
2021-07-01 23:36:15 +00:00
Paul Scovanner
996d1d3a4f Update Security String to 2021-09-01 am: 639164b255
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123745

Change-Id: I2d98e6e8f13a7146d946fd38a7bd9400197a0151
2021-07-01 23:15:23 +00:00
Martin Stjernholm
3d8c30792b Merge "Revert "Use prebuilts of the ART Module by default."" into sc-dev 2021-07-01 16:14:49 +00:00
Martin Stjernholm
751f1ddbef Revert "Use prebuilts of the ART Module by default."
This reverts commit efab03ff61.

Reason for revert: Breaks sc-dev builds.

Merged-In set to http://ag/15107826 to avoid merging downstream.

Bug: 192558747
Change-Id: Id17caafee41b5aed65b5b294c729a548379aa41a
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
2021-07-01 16:12:43 +00:00
Martin Stjernholm
b832fba84c Merge "Use prebuilts of the ART Module by default." into sc-dev 2021-07-01 14:57:38 +00:00
Martin Stjernholm
efab03ff61 Use prebuilts of the ART Module by default.
This means prebuilts located in
/vendor/unbundled_google/modules/ArtGooglePrebuilt and
/prebuilts/module_sdk/art are used instead of sources in /art,
/libcore, and /libnativehelper.

Sanitizer and coverage builds builds are excluded, as are builds using
the products art_module_*, armv8, arm_krait, and others in
device/generic/art.

To keep using ART and libcore sources in local builds, set
SOONG_CONFIG_art_module_source_build=true. See art/build/README.md for
further info.

Merged-In set to http://ag/15107826 to avoid merging downstream.

Test: presubmits
Test: vendor/google/build/build_mainline_modules.sh
  with a line
    build/soong/soong_ui.bash --dumpvar-mode \
      SOONG_CONFIG_art_module_source_build
  directly before the module build commands in
  build_unbundled_mainline_module.sh and check that it's still true.
Bug: 192542393
Merged-In: I8990b726affeb08eabf130d20be45129a7c1c58d
Change-Id: Id719640d17effca107af82de69e45514bf3bd234
2021-07-01 14:20:21 +01:00
Inseob Kim
69389a1c3a Revert "Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars"
Revert "Add install_in_root to cc_binary"

Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: I5e1d58bdb3ebff7125b64a8f2e940f7d203dac74
2021-07-01 06:50:40 +00:00
Inseob Kim
ef49dc6daa Revert "Directly create ramdisk dirs in ramdisk image rule"
Revert "Add install_in_root to cc_binary"

Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: Ic72702cf9d48367b3de30cf29f68a7e8fb0040ce
2021-07-01 06:50:40 +00:00
Inseob Kim
e683a5fcea Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config"
Revert "Add install_in_root to cc_binary"

Revert "Add ramdisk_available to init_first_stage's deps"

Revert submission 15071196-init_first_stage_soong

Reason for revert: fixes b/192248690
Reverted Changes:
I23cf4f975:Add ramdisk_available to init_first_stage's deps
Icd98c7e24:Add ramdisk_available to init_first_stage's deps
If9da9ba16:Add ramdisk_available to init_first_stage's deps
Ibc8668029:Add ramdisk_available to init_first_stage's deps
I3b4b8c475:Add ramdisk_available to init_first_stage's deps
I59cd149e0:Completely migrate init first stage to Soong
I36d789578:Add ramdisk_available to init_first_stage's deps
I2a0daa612:Add BUILD_USES_RECOVERY_AS_BOOT to soong config
Ic76c325ce:Directly create ramdisk dirs in ramdisk image rule...
I4c5374deb:Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars
I8aab5faf3:Add ramdisk_available to init_first_stage's deps
I9d5a10661:Add ramdisk_available to init_first_stage's deps
Iaa2edeb4a:Add ramdisk_available to init_first_stage's deps
I7cb582ca0:Update init_first_stage
I06091d15e:Add ramdisk_available to init_first_stage's deps
I8bdb8dda3:Add ramdisk_available to init_first_stage's deps
I7436b8dd1:Add ramdisk_available to init_first_stage's deps
I39693fd86:Add ramdisk_available to init_first_stage's deps
I0a9ba90f0:Add ramdisk_available to init_first_stage's deps
Ib66b4c4ea:Add ramdisk_available to init_first_stage's deps
I31ce63d23:Add ramdisk_available to init_first_stage's deps
Icb580f97c:Add ramdisk_available to init_first_stage's deps
I044a075b7:Add ramdisk_available to init_first_stage's deps
I33164a7e7:Fix ndk and aml arch order
Ib8d92904a:Add ramdisk_available to sysprop_library
Ibc3516453:Add install_in_root to cc_binary

Change-Id: I2fe09d7a44567f5f3cfd08c89a60e9e94e8fe0e3
2021-07-01 06:50:40 +00:00
Paul Scovanner
7df23ee7aa Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I223dd4c0495601db35c400fdac944713b1d809a3
2021-06-30 22:52:04 +00:00
Paul Scovanner
e88ac64d3d Update Security String to 2021-09-05 am: cfd4896dc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: Ic0a375700bd7dc707449ced79e0efe893cc43a25
2021-06-30 22:37:02 +00:00
Paul Scovanner
639164b255 Update Security String to 2021-09-01
Bug: 192405736
Change-Id: Ie53aed2831d96e9806657e9b8472805f36d54419
Merged-In: Icea699ec7f82744ff0a6dca90068b2737129778a
2021-06-30 01:38:32 +00:00
Paul Scovanner
cfd4896dc2 Update Security String to 2021-09-05
Bug: 192405736
Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a
2021-06-30 00:36:24 +00:00
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
Paul Scovanner
d4f2c30487 Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I83c72777cf01ff01eb99c08f48efa1522fb147e5
2021-06-15 05:52:10 +00:00
Paul Scovanner
2b5cc45a3b Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I43332aebc1ada9a38ea4896e3533d50c51b0871a
2021-06-15 05:39:05 +00:00
Paul Scovanner
731c612c5a Update Security String to 2021-08-01 am: 719f8e6ff2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: Idbfb1d004c6dc78491713cdc5904463c3e4e33af
2021-06-15 05:26:37 +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
719f8e6ff2 Update Security String to 2021-08-01
Bug: 191053489
Change-Id: I704c163481698332aea96919eea01209acedb133
Merged-In: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 19:11:26 +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