Commit Graph

27611 Commits

Author SHA1 Message Date
Mathew Inwood 2c2e1b5a1e Don't use prebuilt modules for sanitizer builds.
Prebuilt modules do not provide sanitizer binaries to using them in this
context is unsafe.

Bug: 194067130
Test: TH
Change-Id: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
2021-07-22 12:01:19 +01:00
Android Build Coastguard Worker f8b1f20454 Make change and version bump to SD2A.210722.001
Change-Id: I4ae87eefef008594456eac3b0a91fde6c940d3c9
2021-07-22 01:19:08 +00:00
Android Build Coastguard Worker 35374e8fac Make change and version bump to SD2A.210721.001
Change-Id: Id0db1309fdf235b95c7a2c60ebcad31ead3b58b1
2021-07-21 01:18:02 +00:00
Yifan Hong 2a3f9ad4f4 Only build OTA package for non-A/B with recovery am: ec91a39248
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15330197

Change-Id: I242695d7f5badab25f67d9ab050bb2269d1f47f0
2021-07-20 05:04:23 +00:00
Android Build Coastguard Worker b990cf157a Version bump to SD2A.210720.002 [core/build_id.mk]
Change-Id: Iff4ca5607e4722eebfbdfbde8f602ad2a3227398
2021-07-20 01:57:49 +00:00
Android Build Coastguard Worker 48891203e1 Make change and version bump to SD2A.210720.001
Change-Id: Ib7a5a0c943d3efdee0b687c2324a7bde1280b757
2021-07-20 01:18:41 +00:00
Android Build Coastguard Worker cec3fc1eff Version bump to SD2A.210719.002 [core/build_id.mk]
Change-Id: I2bb3e91d2848ef51eac78c10eea8873a0f95e903
2021-07-19 18:02:13 +00:00
Yifan Hong ec91a39248 Only build OTA package for non-A/B with recovery
Change I4e5adc3f42a5 alone would break hikey build, which
is a non-A/B device with a boot image, but without recovery.

Do not build OTA in this case.

Test: lunch hikey && m dist
Fixes: 194018054
Bug: 193588301
Change-Id: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
Merged-In: I8d09ad5c62d44699eb910ff62d32044bd97e8e44
2021-07-19 10:46:19 -07:00
Android Build Coastguard Worker 0a1a74f3ea Make change and version bump to SD2A.210719.001
Change-Id: I0c4c341bade47532d5f250981b966c3da09cfc3a
2021-07-18 23:18:19 +00:00
Android Build Coastguard Worker 05828f0c18 Make change and version bump to SD2A.210718.001
Change-Id: I4abf670b5f868aef1fa24a5caeeed9c1b38128e7
2021-07-17 23:18:17 +00:00
Android Build Coastguard Worker 9f4edc2998 Make change and version bump to SD2A.210717.001
Change-Id: I32f59ee0d4d3300c107cdbcd6743a39a3c4b5533
2021-07-17 01:17:48 +00:00
TreeHugger Robot e77d5844d1 Merge changes from topic "ota_for_generic_boot_image" into sc-dev am: 9bbb60e141
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15289192

Change-Id: I9dfa4e8c6215752ceddd9322149f3a4db7150632
2021-07-16 21:58:38 +00:00
Yifan Hong 0e9e4d758c Build OTA when boot image exists even without kernel or recovery fstab am: 73f01711f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15289191

Change-Id: I6bf373c5196abcc15186b66032cb383e1e0693b1
2021-07-16 21:58:37 +00:00
TreeHugger Robot 9bbb60e141 Merge changes from topic "ota_for_generic_boot_image" into sc-dev
* changes:
  Also extract kernel configs from boot image.
  Build OTA when boot image exists even without kernel or recovery fstab
2021-07-16 20:23:47 +00:00
Yifan Hong 73f01711f2 Build OTA when boot image exists even without kernel or recovery fstab
On devices with a prebuilt boot image, TARGET_NO_KERNEL
may be set to enable signing, etc. In this case we still
want to build the OTA package.

Test: m otapackage on a device with generic boot image
      (where TARGET_NO_KERNEL is set)
Bug: 193588301
Change-Id: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
Merged-In: I4e5adc3f42a516ac0e2f66c313dbe34a469ebe05
2021-07-16 09:52:42 -07:00
Yifan Hong cb21f9edc8 Also extract kernel configs from boot image.
On devices with prebuilt generic boot image:
  TARGET_NO_KERNEL := true
  BOARD_PREBUILT_BOOTIMAGE is set
In this case, the process for extracting the kernel
config and version must also try extracting from the
prebuilt boot image.

Test: build on device with prebuilt boot image
Fixes: 193588301
Change-Id: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
Merged-In: I43dd8e206bcd1c9f3f5f51869f126791c50af01a
2021-07-16 09:52:42 -07:00
Android Build Coastguard Worker 8a6cf9ce6a Make change and version bump to SD2A.210716.001
Change-Id: Iee05e2a47c31e6e573ae9d55ad296b344560da7c
2021-07-16 01:18:44 +00:00
Android Build Coastguard Worker 973369c546 Version bump to SD2A.210715.002 [core/build_id.mk]
Change-Id: I550473e9cae21d44ba0271626725dceab359d8c7
2021-07-15 21:34:51 +00:00
TreeHugger Robot 0fa0c84834 Merge "Fix typo in MODULE_BUILD_FROM_SOURCE variable." into sc-dev am: 6f0062ede9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15300830

Change-Id: Ib8d7b74b7083d63dcfa4045967ce8038ab4add0c
2021-07-15 19:02:15 +00:00
Martin Stjernholm 2d6bfdb30c Fix typo in MODULE_BUILD_FROM_SOURCE variable.
Test: env MODULE_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I2056b198bc0b944a6736ff21077b902df13c1479
2021-07-15 16:15:04 +01:00
Android Build Coastguard Worker fe87b54a73 Make change and version bump to SD2A.210715.001
Change-Id: Ia8c12764aea019e6794dfe01a21f177789ab2c8d
2021-07-15 01:18:21 +00:00
Martin Stjernholm 3673e6dcf1 Build the ART module from source if other Mainline modules are. am: 06a7034659
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15277370

Change-Id: Ie0da83bf73591b9c01a621dc7be8a2b9d68bc649
2021-07-14 18:48:50 +00:00
Android Build Coastguard Worker 971679a497 Make change and version bump to SD2A.210714.001
Change-Id: Ib33a35402c7b1c74bc75ac4a0629babda70f6fb7
2021-07-14 01:19:10 +00:00
Martin Stjernholm 06a7034659 Build the ART module from source if other Mainline modules are.
Test: env MODULES_BUILD_FROM_SOURCE=true \
        TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false
Bug: 191978129
Change-Id: I718d3878e9d5f5e710fa3d835a209184b633af48
2021-07-13 23:56:55 +01:00
Android Build Coastguard Worker 8fab827fa1 Make change and version bump to SD2A.210713.001
Change-Id: I7c5ffd10227bc8d64f9e03cdedde18b5e19fcc18
2021-07-13 01:19:12 +00:00
Android Build Coastguard Worker 27c32bdefa Version bump to SD2A.210712.002 [core/build_id.mk]
Change-Id: I3ed3f1c618a52dfff9a272a23ce8644c9bed914e
2021-07-12 17:40:06 +00:00
Android Build Coastguard Worker f443f1d1fa Make change and version bump to SD2A.210712.001
Change-Id: I5507066af13d053f78e03fcc20e818f509303c52
2021-07-11 23:22:28 +00:00
Android Build Coastguard Worker e325b88c2d Make change and version bump to SD2A.210711.001
Change-Id: Iec88521e497d34559600bcf9f6f09ee851b970c4
2021-07-10 23:18:09 +00:00
Android Build Coastguard Worker 7c5bfd693a Make change and version bump to SD2A.210710.001
Change-Id: Ide1b2854753bb504809cc8c030ad914fa11ba289
2021-07-10 01:23:28 +00:00
Martin Stjernholm df1a364796 Add special cases for builds that cannot switch to ART prebuilts. am: fa089f76e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15234811

Change-Id: If0772963b01d55fd5d636271e6a95776c5bd67e0
2021-07-09 12:07:15 +00:00
Android Build Coastguard Worker 517976109f Make change and version bump to SD2A.210709.001
Change-Id: I3a33fb15665e6469726234848769bc520f6be5d4
2021-07-09 01:23:41 +00:00
Android Build Coastguard Worker d695ee7b30 Version bump to SD2A.210708.002 [core/build_id.mk]
Change-Id: I6c6f3f8649b7e76d89415899201195740ab402ae
2021-07-08 21:10:17 +00:00
Martin Stjernholm f68bd2db71 DO NOT MERGE: Use prebuilts of the ART Module by default (reland 2).
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 http://ag/15200786 after fixing various build issues (see tests).
Using DO NOT MERGE to limit presubmit use to the branches for which
prebuilts were updated in http://ag/15189174 and http://ag/15200785.

Test: Heavy presubmits on build_test{,2,3,4} and flame-userdebug
Test: Heavy presubmit on mainline_modules-userdebug on sc-mainline-prod
Bug: 192542393
Change-Id: Id6800fe3564149e6c555b5f68a41b01e9c7dff3f
2021-07-08 16:16:33 +01:00
Martin Stjernholm fa089f76e6 Add special cases for builds that cannot switch to ART prebuilts.
Test: env TARGET_PRODUCT=mainline_modules_x86_64 \
        build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=module_arm build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_arm64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=sdk_g3titan_x86_64 build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Test: env TARGET_PRODUCT=cf_x86_64_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=cf_x86_phone build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=bonito build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns false with http://ag/15234812
Test: env TARGET_PRODUCT=aosp_flame build/soong/soong_ui.bash \
        --dumpvar-mode SOONG_CONFIG_art_module_source_build
  returns true with http://ag/15234812
Bug: 192542393
Change-Id: I544a0cfc9dfe6d738f75e60b7fec6d57f2b51d22
2021-07-08 16:16:14 +01:00
Android Build Coastguard Worker 2fae25e523 Make change and version bump to SD2A.210708.001
Change-Id: Ibafc90a4b8b5b22f2985fcec9e599378ac3edb20
2021-07-08 01:27:03 +00:00
Mohammad Samiul Islam ddfa249778 Merge "Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."" into sc-dev 2021-07-07 14:36:20 +00:00
Mohammad Samiul Islam 5031d7f844 Revert "DO NOT MERGE: Use prebuilts of the ART Module by default (reland)."
This reverts commit 6a3fd20b35.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-mainline-prod&target=mainline_modules-userdebug&lkgb=7528055&lkbb=7528146&fkbb=7528146, bug b/193013377

Change-Id: I896884acbb1dae20019eefeedf13494c4235a1b3
2021-07-07 13:19:08 +00:00
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 bc78c05c44 Merge changes from topic "revert-15071196-init_first_stage_soong-GBJXQRPEKC" into sc-dev am: 7e2e4be86c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167736

Change-Id: Ief116239222f89dbbe6694128ce2b6287a48d335
2021-07-07 03:24:15 +00:00
Inseob Kim b41ad31607 Revert "Directly create ramdisk dirs in ramdisk image rule" am: ef49dc6daa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167735

Change-Id: I69b885d12e9ee3cbd9879e7c7b2319252cef443b
2021-07-07 03:24:08 +00:00
Inseob Kim f64b4d23e6 Revert "Add BUILD_USES_RECOVERY_AS_BOOT to soong config" am: e683a5fcea
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15167734

Change-Id: Ib1db1b0db76e73b1f98471a8219a402d7d7d2bf7
2021-07-07 03:24:01 +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
Android Build Coastguard Worker 3a8efbb7f4 Make change and version bump to SD2A.210707.001
Change-Id: I0cba3d24b658b6c1d3199817832dad7cb0c71f92
2021-07-07 01:18:22 +00:00
Android Build Coastguard Worker 51561d679d Make change and version bump to SD2A.210706.001
Change-Id: Ie33714a076703e5bf80b1b5baab2f080e8eae1e3
2021-07-06 01:20:44 +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
Android Build Coastguard Worker 2de76d449b Make change and version bump to SD2A.210705.001
Change-Id: Ifaa7159c1c6000742e085f0ab17ea342c4a9d787
2021-07-04 23:18:33 +00:00
Android Build Coastguard Worker 34c24f98c3 Make change and version bump to SD2A.210704.001
Change-Id: I2d59934c6f5f972efe76a2e0dbe557f6af2e2b50
2021-07-03 23:23:36 +00:00
Android Build Coastguard Worker 0abde3c0b9 Make change and version bump to SD2A.210703.001
Change-Id: I3998b5c4de0c234756e128ee62882280e01a2e2d
2021-07-03 01:18:08 +00:00
Android Build Coastguard Worker 60478ba91f Make change and version bump to SD2A.210702.001
Change-Id: Ic1c9ecee2c5e5fdd58abf41a6a276110992690e4
2021-07-02 01:23:01 +00:00
Android Build Coastguard Worker 6f06fefcf3 Version bump to SD2A.210701.002 [core/build_id.mk]
Change-Id: I2caff0967685823f224ad25c46a461e620ab5b74
2021-07-01 17:42:05 +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 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
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
Android Build Coastguard Worker 0708aa2da2 Make change and version bump to SD2A.210701.001
Change-Id: I87daa3cc0f98a312d3a4b8b6d8f3360f796b92d3
2021-07-01 01:32:28 +00:00
Paul Scovanner 32a8473026 Update Security String to 2021-09-05 am: cfd4896dc2 am: e88ac64d3d am: 7df23ee7aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15123744

Change-Id: I4f45e7bc32b914285c02f939872efcf77c53f1da
2021-06-30 23:05:32 +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
Android Build Coastguard Worker a2e8a11c25 Version bump to SD2A.210630.003 [core/build_id.mk]
Change-Id: I0ed503604837c3316c3ab3e6a25f1aec57b0efd9
2021-06-30 22:35:38 +00:00
Android Build Coastguard Worker 0da583c30e Version bump to SD2A.210630.002 [core/build_id.mk]
Change-Id: Id1ad2bd6a9ec5af21d5548d2451d6105a7c4a06f
2021-06-30 16:09:36 +00:00
Martin Stjernholm c19612b8a3 Merge "Force building ART from source for AOSP products." into sc-dev am: a18d4d84db
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15107826

Change-Id: I45e67ad86dc0397ab3a123c01a9c7cfeb83717ff
2021-06-30 15:09:56 +00:00
Android Build Coastguard Worker e4234dfc48 Make change and version bump to SD2A.210630.001
Change-Id: If8922e4bf64fa8503223b5ab141a43a9015500db
2021-06-30 01:19:05 +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
Android Build Coastguard Worker 809641fed2 Make change and version bump to SD2A.210629.001
Change-Id: I9cbbeb44da06a30e4057cd7da7803cef2838e93e
2021-06-29 01:29:11 +00:00
Android Build Coastguard Worker 7aafb8e593 Make change and version bump to SD2A.210628.002
Change-Id: I8710167070bab2acaff6462420ac81b3c10db63a
2021-06-28 04:44:22 +00:00
Android Build Coastguard Worker 9c18d3eed1 Make change and version bump to SD2A.210628.001
Change-Id: Ic0358fbff82312283c2847495cd71d52b4f6b932
2021-06-27 23:18:36 +00:00
Android Build Coastguard Worker 583e05d816 Make change and version bump to SD2A.210627.001
Change-Id: If08286a8cc4a724d84fb90af1d4a8db40d739ee2
2021-06-26 23:18:01 +00:00
Android Build Coastguard Worker f7dd326022 Make change and version bump to SD2A.210626.001
Change-Id: I2126458fc2d28ecebbb592726d81ec8635fc410f
2021-06-26 01:18:18 +00:00
Dario Freni 5301b846f3 Merge "Add MODULE_BUILD_FROM_SOURCE env variable." into sc-dev am: 14abe199e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15090043

Change-Id: Iaf388de4a3c5da83a60f5a71cee5d39d18f6f3fa
2021-06-25 14:13:05 +00:00
Dario Freni 14abe199e2 Merge "Add MODULE_BUILD_FROM_SOURCE env variable." into sc-dev 2021-06-25 13:53:41 +00:00
Android Build Coastguard Worker bf45daf01d Make change and version bump to SD2A.210625.002
Change-Id: I70f812b240659bf6dd473c52e82b3cfce1eaaa39
2021-06-25 03:35:44 +00:00
Android Build Coastguard Worker 4396eb8011 Make change and version bump to SD2A.210625.001
Change-Id: I301fbc9761be8ced47ffc7f572da468227f29d11
2021-06-25 01:18:54 +00:00
TreeHugger Robot abeb9ec656 Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev am: 1e6044e5da
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15088021

Change-Id: I4724183a24345603449a84d7d29797b3b71cd059
2021-06-25 00:14:37 +00:00
TreeHugger Robot 1e6044e5da Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev 2021-06-24 23:59:05 +00:00
Android Build Coastguard Worker 05c8704d96 Version bump to SD2A.210624.002 [core/build_id.mk]
Change-Id: I0e79d8f74deadeb89658f20f27510d70dd6930c5
2021-06-24 23:53:46 +00:00
Inseob Kim 6bcad4a519 Add BUILD_USES_RECOVERY_AS_BOOT to soong config am: 94b0556c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070334

Change-Id: Iaae16de89c09cb7b99e5b0addf540860d64fb452
2021-06-24 23:44:14 +00:00
Inseob Kim 3798b390aa Directly create ramdisk dirs in ramdisk image rule am: f3897b668d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070333

Change-Id: Ideb92d32cb70502b1e917dd8521db2f25fa8ca63
2021-06-24 23:44:07 +00:00
Inseob Kim 69326d77ab Add BOARD_BUILD_SYSTEM_ROOT_IMAGE to config vars am: a9af042d58
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15070332

Change-Id: I1160df4e119644d2022eeca3879e25487c2c30df
2021-06-24 23:44:00 +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 242c4362428a6e0e0093cc739c7f730e73f87af1)
2021-06-24 13:14:29 +00:00
Android Build Coastguard Worker 0f39d37017 Make change and version bump to SD2A.210624.001
Change-Id: Idd3181c4f719ddf4dfffe07164e344236d5287e7
2021-06-24 01:24:39 +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
Android Build Coastguard Worker b7920d3f6b Make change and version bump to SD2A.210623.001
Change-Id: I28e476a484539515aacd53362969f3fd389eae2a
2021-06-23 01:20:28 +00:00
Devin Moore 0fae78cd7a Revert "Throw an error if androidboot.hardware is used for bootconfig" am: 36b659550e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15054410

Change-Id: I53c39254879e4485eaad229bf05ed3844b231cf3
2021-06-22 18:08:43 +00:00
android-build-team Robot 56c3919880 Version bump to SD2A.210622.002 [core/build_id.mk]
Change-Id: I5085deb5bdf1696effa23ab776a5b145f714a1a1
2021-06-22 15:58:00 +00:00
android-build-team Robot 66282d8c77 Make change and version bump to SD2A.210622.001
Change-Id: I57a158e48b752ddf1a608d63466f53406dda0cb1
2021-06-22 01:19:42 +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
android-build-team Robot c021a60ee1 Make change and version bump to SD2A.210621.001
Change-Id: Id3bef4f90b5694d76ad7bf8b5ca57e4ba61ec738
2021-06-20 23:18:36 +00:00
android-build-team Robot 9dbfb86edf Make change and version bump to SD2A.210620.001
Change-Id: I7ef18cdf64a216ceaf567f6bc0cd31f6c56a6f47
2021-06-19 23:18:07 +00:00
android-build-team Robot ab77fd9880 Make change and version bump to SD2A.210619.001
Change-Id: I7cfa38b88a8faa33c722158e2c84a51cb8768a13
2021-06-19 01:18:01 +00:00
android-build-team Robot 1633d0a1d9 Version bump to SD2A.210618.002 [core/build_id.mk]
Change-Id: I46b73d73652c5676e2fb8434b14dbeac53f44be1
2021-06-18 16:57:15 +00:00
android-build-team Robot de2eb1efb6 Make change and version bump to SD2A.210618.001
Change-Id: I8cb8f1d75980f6f926a6c083c27f0f594b443a0f
2021-06-18 01:25:11 +00:00
TreeHugger Robot ce53a0ff9e Merge changes Ie63d08ac,Ia7f8200c into sc-dev am: c66099dcc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15008279

Change-Id: I260893b558d643c29983d3c5f217c0b136237714
2021-06-17 15:19:19 +00: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
android-build-team Robot dd162fcc77 Version bump to SD2A.210617.002 [core/build_id.mk]
Change-Id: Ic2d1d23f9133d9549e8278fb1516a65d1c8d3a2b
2021-06-17 14:59:40 +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
android-build-team Robot ee238c4f0c Make change and version bump to SD2A.210617.001
Change-Id: I78e8c85fadad306585bdef4645b388ab5f228a93
2021-06-17 01:26:27 +00:00
TreeHugger Robot 6aacf83adf Merge "Add ro.vendor.build.dont_use_vabc to disable VABC OTA" into sc-dev am: 6e2acf1c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14970372

Change-Id: I758ee84f90e237eb4f4617b72a0345a6b06f06eb
2021-06-16 21:08:02 +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 0a30cc41bc8acd25058d9751a75184cb9504b93b)
2021-06-16 19:54:07 +00:00
android-build-team Robot b55d6a9330 Version bump to SD2A.210616.003 [core/build_id.mk]
Change-Id: Ie88d6aa8d64b476dc44253633a41742cf0f256dd
2021-06-16 18:03:43 +00:00
android-build-team Robot eb4b55f5de Version bump to SD2A.210616.002 [core/build_id.mk]
Change-Id: Ibdf0935441d4d1f18c3a7b0d5333c651ea64daa1
2021-06-16 03:23:08 +00:00
android-build-team Robot d1d161aa33 Make change and version bump to SD2A.210616.001
Change-Id: I8cb76918c14b7bec6e6a6f004afaf213a3207ddf
2021-06-16 01:18:13 +00:00
android-build-team Robot bdfacdccd0 Version bump to SD2A.210615.002 [core/build_id.mk]
Change-Id: I8632d71d0eb9e1e4ec88123317bee32c8948c557
2021-06-16 00:37:55 +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
android-build-team Robot 19d5ea59b6 Make change and version bump to SD2A.210615.001
Change-Id: Ia8123a5f9cdebea57961ab00e8aa2c180e6138e6
2021-06-15 01:24:45 +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
android-build-team Robot 8fe56593b1 Make change and version bump to SD2A.210614.001
Change-Id: I7403ff01984ddb99c3f2dd1258680cd642d0f5ec
2021-06-13 23:18:17 +00:00
android-build-team Robot 8bf90863f0 Make change and version bump to SD2A.210613.001
Change-Id: I01bedca685acde6a9e4be7991aa6325fe8738919
2021-06-12 23:18:22 +00:00
android-build-team Robot acc538eaa2 Make change and version bump to SD2A.210612.001
Change-Id: I48187d5fea5d79b08aead26b94758b805a0b75b1
2021-06-12 01:17:58 +00:00
android-build-team Robot 66a6332b3d Make change and version bump to SD2A.210611.003
Change-Id: If365e8882f498f6cdcec7647b4d49336196b16bf
2021-06-11 06:55:17 +00:00
android-build-team Robot 0d5f923c6c Make change and version bump to SD2A.210611.002
Change-Id: I7446c29ab0c25d66aa264d74872ed6afa334e97d
2021-06-11 04:15:34 +00:00
android-build-team Robot e4b0337858 Make change and version bump to SD2A.210611.001
Change-Id: I277b1c9606ead3b045f8ee4fb9d2a0501c4d2d22
2021-06-11 01:35:18 +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
android-build-team Robot b914490463 Make change and version bump to SD2A.210610.002
Change-Id: Ib7646a59ccd02113c59284c40769a9e4b5235f7d
2021-06-10 08:43:27 +00:00
android-build-team Robot 51c289065d Make change and version bump to SD2A.210610.001
Change-Id: I5ea79da9ca925e2dc3e5c311765aae3cbcfa06aa
2021-06-10 01:26:46 +00:00
android-build-team Robot b71a6fa1bc Version bump to SD2A.210609.002 [core/build_id.mk]
Change-Id: Ic2869dc9bfdc66a78dcd96752432007a72faaaca
2021-06-09 17:11:39 +00: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
android-build-team Robot 11d3e40c03 Make change and version bump to SD2A.210609.001
Change-Id: Ib411c51b74c81fdea9c6ccdf362e93ff73e7e5b1
2021-06-09 01:18:31 +00:00
android-build-team Robot 196d3599a9 Make change and version bump to SD2A.210608.001
Change-Id: I0505fe6f3168daed43020c6bec38c2a9e6e4ec0c
2021-06-08 01:18:32 +00:00
android-build-team Robot 26ae7a8c22 Version bump to SD2A.210607.002 [core/build_id.mk]
Change-Id: Ie82ba02bb0f80868251f946b1a325c9ba6b99105
2021-06-07 19:59:24 +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
android-build-team Robot 7fdfbcd411 Make change and version bump to SD2A.210607.001
Change-Id: I559acd0ef453cd1f438f250305827d4ce99949ff
2021-06-06 23:21:03 +00:00
android-build-team Robot 2bb3979306 Make change and version bump to SD2A.210606.001
Change-Id: I044c4950ec341f6a42d0f7876c2495c4bbaedd7d
2021-06-05 23:20:44 +00:00
android-build-team Robot ca0703cb8e Make change and version bump to SD2A.210605.001
Change-Id: Ib78ff07b06462e35b67f4ccbc8c9cdb256c50ce7
2021-06-05 01:18:18 +00:00
android-build-team Robot de63eb0c63 Version bump to SD2A.210604.002 [core/build_id.mk]
Change-Id: I73e1877a9afd2a084411acab1200f773156e4fb8
2021-06-04 21:29:26 +00:00
android-build-team Robot 9dc49e2a00 Make change and version bump to SD2A.210604.001
Change-Id: I65b12f5f4474b4247e629ab5ced43ba2f33124a2
2021-06-04 01:18:36 +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 f93c13d51bff2478d4bcf48c808bc78a5ce0b989)
2021-06-04 00:05:55 +00:00
android-build-team Robot a8aad862e2 Version bump to SD2A.210603.002 [core/build_id.mk]
Change-Id: Ie97db9b0e0edd9bf16367aec168a2dc940cccaa1
2021-06-03 17:35:13 +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
android-build-team Robot a1f5dee750 Make change and version bump to SD2A.210603.001
Change-Id: I490a7f8d462fa2046eaabab4fe3c6e85f00284a5
2021-06-03 01:20:17 +00: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
android-build-team Robot 5f268be353 Version bump to SD2A.210602.003 [core/build_id.mk]
Change-Id: I156694de334a2b9be9df32efe3fcf1a38646c519
2021-06-02 18:53:48 +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
android-build-team Robot 1f67262dc9 Version bump to SD2A.210602.002 [core/build_id.mk]
Change-Id: Id63e1e5510d667de38758e9bb357604d92d154b5
2021-06-02 01:33:02 +00:00
android-build-team Robot d44ffd9cfc Make change and version bump to SD2A.210602.001
Change-Id: Ia623ba98c87c1a6d5754859d4b8be2be2c1753ed
2021-06-02 01:19:54 +00: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
android-build-team Robot 73d4090a12 Make change and version bump to SD2A.210601.001
Change-Id: I5e06745d9793778e586b4c4dd46474e246ae14d6
2021-06-01 01:18:23 +00:00
android-build-team Robot 759eeeeb51 Make change and version bump to SD2A.210531.001
Change-Id: I4253aadd796519858cb83d900b7f7b01668468e4
2021-05-30 23:19:07 +00:00
android-build-team Robot c3e15bf08d Make change and version bump to SD2A.210530.001
Change-Id: I6c5e896b7065bb3fd938f50fdb9aa12ae8497999
2021-05-29 23:19:03 +00:00
android-build-team Robot 571b1d3eec Make change and version bump to SD2A.210529.001
Change-Id: I98881b86a14e5b1ceb17540b7de7d2d2561ef709
2021-05-29 01:20:21 +00:00
android-build-team Robot 638666c5d5 Make change and version bump to SD2A.210528.001
Change-Id: Ife2dc304e170e1efdf687ace663e28b326a11e19
2021-05-28 01:19:31 +00:00
Bowgo Tsai 22fb8a4709 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" into sc-dev 2021-05-28 00:35:40 +00:00
android-build-team Robot 1dea90c0af Make change and version bump to SD2A.210527.002
Change-Id: Ibb566f70ca72d9f69ab47c4a692aedeadde4d77a
2021-05-27 11:39:20 +00:00
android-build-team Robot f91d9c12c5 Make change and version bump to SD2A.210527.001
Change-Id: Icf04f4b923932aa4f94037ed74da855c9826a59c
2021-05-27 01:18:55 +00:00
android-build-team Robot 90e8c41d28 Version bump to SD2A.210526.003 [core/build_id.mk]
Change-Id: I4ea804c22d05fba9bdee2aeb8459d22973bd8614
2021-05-27 00:27:27 +00:00
android-build-team Robot 0f6679bb81 Version bump to SD2A.210526.002 [core/build_id.mk]
Change-Id: I0a4da25168acd4b043b1f7b369d1a4da8155277d
2021-05-26 23:19: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 294ec7d9e5298d91768e0f2e9abe4cc7de180fe1)

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
android-build-team Robot 76fd9eb0b1 Make change and version bump to SD2A.210526.001
Change-Id: I8d0070bb7f14910806709554bca760a4afcb3bf1
2021-05-26 01:18:45 +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 cf9ead8972dd2b7c90772b6a1fd26bd4311a7c74)
2021-05-26 09:11:00 +08:00
android-build-team Robot d684d9b85e Make change and version bump to SD2A.210525.001
Change-Id: Ia6612fd3e099bb6fc08899bea24ed8296b700057
2021-05-25 01:18:48 +00: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 d5e6a7c6200c0bafad3ea5d1f6c62f37420b86db)
2021-05-24 06:23:47 -07:00
android-build-team Robot 76af51130a Make change and version bump to SD2A.210524.001
Change-Id: I3ba98408a5f64af2dfa41851c8c08d0f3c3fe437
2021-05-23 23:18:22 +00:00
android-build-team Robot 25195538e1 Make change and version bump to SD2A.210523.001
Change-Id: I10962fd278a5f45c836e928ef61abe75d7a42323
2021-05-22 23:18:01 +00:00
android-build-team Robot 80b5ca15ac Make change and version bump to SD2A.210522.001
Change-Id: I555e50f7bdd810a1aee54f55a03d055d1397fcd5
2021-05-22 01:17:26 +00:00
android-build-team Robot f24561952b Version bump to SD2A.210521.002 [core/build_id.mk]
Change-Id: I86e8367792ffdd5ef407ac0eef7b0f01f33b29c8
2021-05-21 21:20:37 +00:00
android-build-team Robot f2038e6d3b Make change and version bump to SD2A.210521.001
Change-Id: I701770a3a5a08dc536ad7190b55ae5c629edfb6f
2021-05-21 01:20:23 +00:00
android-build-team Robot ae789ffed5 Make change and version bump to SD2A.210520.001
Change-Id: If36d219f6d0b621fff792ea05b64c30c25442f73
2021-05-20 01:18:08 +00: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
android-build-team Robot 54f1768d1e Make change and version bump to SD2A.210519.001
Change-Id: Ic2b311eece0649c26143297a27899d2a77846206
2021-05-19 01:18:02 +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 640544bd96946b5a512c59d42e3f3c24682697fe)
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
Treehugger Robot c79de76e3e Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7 am: 9fda600aa3
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: If5d80fcf192bace7c400bec76e77d55e2ea92af9
2021-05-14 03:02:57 +00:00
Treehugger Robot 9fda600aa3 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe am: e9b9f7f0f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: Id7de61da766da6e0a6ee39e3ee54d0ca902de25f
2021-05-14 02:39:04 +00:00
Treehugger Robot e9b9f7f0f7 Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" am: bf5d6238fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1705507

Change-Id: I35bbe366e804b38aafb37a85f41bc71d0afb17ee
2021-05-14 01:53:24 +00:00
Anthony Hugh ad645285a6 Revert "Revert^2 "Enforce <uses-library> check for Android.mk modules.""
This reverts commit b6d1b48f9f.

Reason for revert: This change is breaking seahawk-userdebug

BUG: 188108611

Change-Id: I15b737e2778d437ecbef6ab9f43345da407f2205
2021-05-14 01:52:06 +00:00
Treehugger Robot bf5d6238fe Merge "Don't make dexpreopt_tools.zip when dex2oat isn't avilable" 2021-05-14 01:21:41 +00:00
Jaewoong Jung b34f64fc7a Do not alter presigned prebuilt apks for SDK > 29.
Bug: 185811447
Test: Manual
Change-Id: I5ea143331e1bd1885dde4e46b086f4ce811f4981
2021-05-13 16:16:19 -07:00
android-build-team Robot e081eef93d Make change and version bump to SD2A.210513.001
Change-Id: I9456b1508b0601017c845f0271693f3b626045fe
2021-05-13 21:24:51 +00:00
Ulyana Trafimovich aeb62e4cbd Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-13 16:23:31 +00:00
Treehugger Robot ae6bdc0c74 Merge "Revert^2 "Enforce <uses-library> check for Android.mk modules."" 2021-05-13 12:31:44 +00:00
Ulyana Trafimovich b6d1b48f9f Revert^2 "Enforce <uses-library> check for Android.mk modules."
This reverts commit 4caef2b8c8.

Reason for revert: relanding original CL after fixing r11-userdebug.
Bug: 132357300
Test: forrest build for git_master/r11-userdebug

Change-Id: I62268f331c76f31a80b610754c53543b9b59a1c6
2021-05-13 11:59:52 +00:00
Ulyana Trafimovich 7ceafdaf34 Revert^2 "Enforce <uses-library> check for Android.mk modules."
This reverts commit a700ad4651.

Reason for revert: relanding original CL with correct Merged-In tag.

Use "Merged-In" tag from CL ag/14062434 to prevent merging in the
stage-aosp-master branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Change-Id: I10de5b56c51a0407bf027e0be5ac3b0b307cf100
Test: treehugger
Merged-In: I21712e5197b3cb06e82e476f4c2f7277142034e9
2021-05-13 09:52:38 +00:00
Jeongik Cha 62519def7b Don't make dexpreopt_tools.zip when dex2oat isn't avilable
Test: m
Bug: 158843648
Change-Id: Iae90ea60fc73f1a6202499528277fce7c950d9d3
2021-05-13 13:29:39 +09:00
Treehugger Robot fdca5d9faa Merge "Target for tools to dexpreopt" am: 26bad544c5 am: ee88da65f5 am: 4beb444294
Original change: https://android-review.googlesource.com/c/platform/build/+/1688306

Change-Id: I91c8fd16af6707d159b448668082fed25d215531
2021-05-13 01:27:10 +00:00
Treehugger Robot 4beb444294 Merge "Target for tools to dexpreopt" am: 26bad544c5 am: ee88da65f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1688306

Change-Id: I5fd65c6cb65bda59008caf14c355cd9d4b03f863
2021-05-13 00:55:18 +00:00
Ulyana Trafimovich a700ad4651 Revert "Enforce <uses-library> check for Android.mk modules."
This reverts commit 0b154519b0.

Reason for revert: breaks the builds on stage-aosp-master

Change-Id: I72b45041ea8f1d73a57a2788a79183150c12e547
2021-05-12 22:20:12 +00:00
Ulyana Trafimovich 4caef2b8c8 Revert "Enforce <uses-library> check for Android.mk modules."
Bug: 187980797

This reverts commit feeb6bcd1e.

Reason for revert: breaks r11-userdebug build.

Change-Id: Iab296d6fa6e1c1e0d06f37609e06b63b72bfdacc
2021-05-12 22:16:09 +00:00
Jeongik Cha 2522c36b4c Target for tools to dexpreopt
Bug: 158843648
Test: m droidcore
Change-Id: I580e2b3285cc524234859998a0e4e072ecaef072
2021-05-12 23:28:49 +09:00
Ulya Trafimovich 0b154519b0 Enforce <uses-library> check for Android.mk modules.
Use "Merged-In" tag from CL ag/14063987 to prevent merging in the
rvc-qpr-dev-plus-aosp branch. That CL is unrelated to the current CL,
but related to <uses-library> checks in general.

Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
Merged-In: I26f2887357193b0d4bb951fa5bb09384c149b381
(cherry picked from commit feeb6bcd1e)
2021-05-12 14:19:40 +00:00
Ulya Trafimovich feeb6bcd1e Enforce <uses-library> check for Android.mk modules.
Bug: 132357300
Test: treehugger
Change-Id: If31a9ed148e4f1195bf916a650d0afafef3d6915
2021-05-12 11:49:41 +01:00
Tianjie Xu 216c762826 Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1 am: 5678ae7b1c
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I7a751270df9a6c02763c228f495c40c046c0115b
2021-05-09 00:10:02 +00:00
Tianjie Xu 5678ae7b1c Merge "Don't set the build id if we need to append the digest" am: a530481db1 am: 834dc90be1
Original change: https://android-review.googlesource.com/c/platform/build/+/1695406

Change-Id: I9b8b41c7890ecc8a6c32cc249b0db9fd72be3e7a
2021-05-08 23:30:17 +00:00
Tianjie Xu a530481db1 Merge "Don't set the build id if we need to append the digest" 2021-05-08 22:56:56 +00:00
Treehugger Robot 62a73dbed0 Merge "DO NOT MERGE - Merge RQ2A.210505.003." 2021-05-08 21:38:02 +00:00
Treehugger Robot 28e99c4932 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74 am: 9bafad0c19
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: Ia34ad43307ce10e08d025c1c21e33fc8099e3cdf
2021-05-08 02:45:56 +00:00
Treehugger Robot 9bafad0c19 Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" am: 5a75afbede am: 593ab41f74
Original change: https://android-review.googlesource.com/c/platform/build/+/1699567

Change-Id: I7eae52cdbf184d1c86bf0d073b37c2f06756076d
2021-05-08 02:27:10 +00:00
Xin Li 7a2e4a990a DO NOT MERGE - Merge RQ2A.210505.003.
Bug: 187544653
Merged-In: Ica626a3b19e5b642807234c288428cd7e0f40f98
Change-Id: I3ff9da08d4c59e59a50bc89a6f962b185f8d3942
2021-05-07 18:51:09 -07:00
Treehugger Robot 5a75afbede Merge "Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost" 2021-05-08 01:47:39 +00:00
Jeongik Cha f17cca4813 Rename DexPreoptImageLocations to DexPreoptImageLocationsOnHost
The field is the path on the host side. Rename it to be more specific.

Bug: 158843648
Test: m
Change-Id: Ifa37c5f459440a30d508f37f9913f9e559ae6574
2021-05-07 20:29:29 +09:00
Inseob Kim 972de1ef9f Merge "Add BOARD_USES_ODMIMAGE to soong config" am: 6fa22ce3fa am: 1373c3ffac am: d39aca4357
Original change: https://android-review.googlesource.com/c/platform/build/+/1697491

Change-Id: I6200017a49162bccea9f1fd0c27c5f7bdfc83a3d
2021-05-07 01:03:02 +00:00
Inseob Kim d39aca4357 Merge "Add BOARD_USES_ODMIMAGE to soong config" am: 6fa22ce3fa am: 1373c3ffac
Original change: https://android-review.googlesource.com/c/platform/build/+/1697491

Change-Id: I757c7aa5dee1408e2bd8e3d57bc70e55fa8ca0da
2021-05-07 00:44:10 +00:00
Inseob Kim 6fa22ce3fa Merge "Add BOARD_USES_ODMIMAGE to soong config" 2021-05-06 23:59:18 +00:00
satayev d22401b36a Merge "Add 'platform:' prefix to unqualified system server jars." am: 9eb1435745 am: 0e7db454da am: 0da313110d
Original change: https://android-review.googlesource.com/c/platform/build/+/1695660

Change-Id: If4dbc8b1097f45e662f009c6c901391e428b8df0
2021-05-06 12:24:59 +00:00
satayev 0da313110d Merge "Add 'platform:' prefix to unqualified system server jars." am: 9eb1435745 am: 0e7db454da
Original change: https://android-review.googlesource.com/c/platform/build/+/1695660

Change-Id: I0cc4cbe52c2414024af816f7bc4d451e591200bf
2021-05-06 12:09:30 +00:00
satayev 9eb1435745 Merge "Add 'platform:' prefix to unqualified system server jars." 2021-05-06 11:32:39 +00:00
Inseob Kim c58ff2cde9 Add BOARD_USES_ODMIMAGE to soong config
Bug: 33691272
Test: m selinux_policy
Change-Id: I20a5b61d8ae830caa8792662a9e9886f3da05af8
2021-05-06 11:09:13 +00:00
Colin Cross 25814d5ee0 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" am: 05302dade9 am: 48ef312c29 am: fe70e5b756
Original change: https://android-review.googlesource.com/c/platform/build/+/1697782

Change-Id: I01d6fdf72d8d0d8be01d9976157f4ddef19a76ed
2021-05-06 04:41:56 +00:00
Colin Cross fe70e5b756 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" am: 05302dade9 am: 48ef312c29
Original change: https://android-review.googlesource.com/c/platform/build/+/1697782

Change-Id: Ibee2105bb4f912d2b616da95b2b7da2389a999e3
2021-05-06 04:16:14 +00:00
Colin Cross 05302dade9 Merge "Fix reference to uncleared variable in dex_preopt_odex_install.mk" 2021-05-06 03:16:20 +00:00
Tianjie 9797623c2a Don't set the build id if we need to append the digest
Background in http://go/compatible-build-fingerprint. If we want
to append unique vbmeta digest to build id, we cannot setup the
prop value at build time. Instead, set the old value as
ro.build.legacy.id; and let init set ro.build.id at runtime.

Bug: 186786987
Test: build a target file with the flag on
Change-Id: Ie139725bb7e5c65bd3f28f43b9975ba48ee10354
2021-05-06 00:32:56 +00:00
Colin Cross 7b70d98d1f Fix reference to uncleared variable in dex_preopt_odex_install.mk
dex_preopt_odex_install.mk referenced $(built_module), which is only
set by some prebuilt modules, leaving old values when building
non-prebuilt modules.  Use $(LOCAL_BUILT_MODULE) instead, which is set
for all modules by base_rules.mk.

Test: manual
Change-Id: Iecf092f9869d5edda3671d0999987906781d023e
2021-05-05 14:43:04 -07:00
satayev 35a7a43b56 Add 'platform:' prefix to unqualified system server jars.
This allows Soong side changes to treat SystemServerJars as
android.ConfiguredJarList, same as boot jars.

Bug: 180105615, 155630745
Test: m && launch_cvd
Change-Id: I717d4351edcd82028ac19cb9265e18b98d11c661
2021-05-05 15:18:39 +01:00
Hamzeh Zawawy 8963e14abe Merge "Add new target for building rust fuzzers for haiku" am: 26e4d3ed11 am: 75a2f742a6 am: eaf6a6ce8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1691405

Change-Id: Ib8b75ee242b94f03e2b54425a5a8ed6953ed86f2
2021-05-03 17:41:51 +00:00
Hamzeh Zawawy eaf6a6ce8d Merge "Add new target for building rust fuzzers for haiku" am: 26e4d3ed11 am: 75a2f742a6
Original change: https://android-review.googlesource.com/c/platform/build/+/1691405

Change-Id: Iedd67c49460a3440f04eacf47a1d9cd22fba97a2
2021-05-03 17:25:02 +00:00
Hamzeh Zawawy 26e4d3ed11 Merge "Add new target for building rust fuzzers for haiku" 2021-05-03 16:42:59 +00:00
David Srbecky 7568db864b Merge "Propagate CREATE_MINIDEBUGINFO to strip.sh" am: d18e14229c am: 9ad4c9219a am: 802c44c3f8
Original change: https://android-review.googlesource.com/c/platform/build/+/1692409

Change-Id: If2e7fd4aaec64a2b661d6169a6d92aaafd83a50f
2021-05-03 16:41:34 +00:00
David Srbecky 802c44c3f8 Merge "Propagate CREATE_MINIDEBUGINFO to strip.sh" am: d18e14229c am: 9ad4c9219a
Original change: https://android-review.googlesource.com/c/platform/build/+/1692409

Change-Id: I03d8b7a26ff622ad05b6f49543861143c1e4e4ba
2021-05-03 16:17:21 +00:00
David Srbecky d18e14229c Merge "Propagate CREATE_MINIDEBUGINFO to strip.sh" 2021-05-03 15:42:01 +00:00
David Srbecky bf086ed1a6 Propagate CREATE_MINIDEBUGINFO to strip.sh
Bug: 110133331
Test: m
Change-Id: I5899ad1c0f6111a48eabe7a104a573787cc688e7
2021-04-30 21:41:19 +01:00
Colin Cross e81cfd8344 Merge "Use order-only dependencies for symbols files" am: b847012f3b am: 39c14920b1 am: 799ecd9969
Original change: https://android-review.googlesource.com/c/platform/build/+/1688962

Change-Id: I440a4ce8ea4f74f04c94294ab0b9c3f57abc5949
2021-04-30 15:14:21 +00:00
Colin Cross 799ecd9969 Merge "Use order-only dependencies for symbols files" am: b847012f3b am: 39c14920b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1688962

Change-Id: I25ab79b5897db0f183fa86128bf9e891449dfaaf
2021-04-30 15:06:28 +00:00
Colin Cross b847012f3b Merge "Use order-only dependencies for symbols files" 2021-04-30 14:42:46 +00:00
hamzeh 5dfe7a214b Add new target for building rust fuzzers for haiku
Test: make haiku-rust
Change-Id: I0badb5c0ae4138abdbd3f9a404e8883f70ceb503
2021-04-29 13:28:04 -07:00
jschung 904e1735c8 Include android-gts/lib folder in android-gts.zip
Some gts tests such as JniUncompressGtsTestCases need native libraries
and those should be located under android-gts/lib.

Test: confirmed that the android-gts.zip includes lib folder
Bug: 186595833
Change-Id: I7d0605d0aff861059e3788630585e9ba412f9cac
2021-04-29 16:32:47 +09:00
Christian Wailes 6506d653a7 Merge "Update init.rc prebuilt handling" am: a6d2d8c79a am: ce4ec04629 am: 6734bccc47
Original change: https://android-review.googlesource.com/c/platform/build/+/1678345

Change-Id: I5b515b60b2392e35758c3849fd3b2083b97b2720
2021-04-28 20:23:52 +00:00
Christian Wailes 6734bccc47 Merge "Update init.rc prebuilt handling" am: a6d2d8c79a am: ce4ec04629
Original change: https://android-review.googlesource.com/c/platform/build/+/1678345

Change-Id: I5c42fc5f2a89515a2298b52c21537429bb8569a4
2021-04-28 19:47:59 +00:00
Treehugger Robot 8aa7710d01 Merge "Moving debug ramdisk resources under / of the ramdisk" am: 2c806a7c94 am: fe4b552210 am: c3e5165e82
Original change: https://android-review.googlesource.com/c/platform/build/+/1685172

Change-Id: If85fa35ccc2208a206e883f7b9f3b5f62a0df4fd
2021-04-28 18:59:06 +00:00
Treehugger Robot c3e5165e82 Merge "Moving debug ramdisk resources under / of the ramdisk" am: 2c806a7c94 am: fe4b552210
Original change: https://android-review.googlesource.com/c/platform/build/+/1685172

Change-Id: I2c3b3271d25eb5e27dbe13af534a5353862a8fa0
2021-04-28 18:41:44 +00:00
Christian Wailes a6d2d8c79a Merge "Update init.rc prebuilt handling" 2021-04-28 16:41:09 +00:00
Treehugger Robot 2c806a7c94 Merge "Moving debug ramdisk resources under / of the ramdisk" 2021-04-28 16:27:34 +00:00
Colin Cross db98001be1 Use order-only dependencies for symbols files
Use an order-only dependency from $(LOCAL_BUILT_MODULE) to the symbols
file so that wiping the symbols directory during installclean doesn't
force anything to rebuild.

Bug: 186507256
Test: m && rm -rf $OUT/symbols && m
Change-Id: Ic164819c71f9db6126ff91c58752c8727cde0d5e
2021-04-27 19:43:33 -07:00
Treehugger Robot 610726689c Merge "Copy dexpreopt.config only if it exists" am: 5e5b52033c am: 66a74eb2cb am: e2421c5067
Original change: https://android-review.googlesource.com/c/platform/build/+/1685486

Change-Id: I1620ffd25e8ff59bc83858df10e4d10c6cba2411
2021-04-26 17:58:00 +00:00
Treehugger Robot e2421c5067 Merge "Copy dexpreopt.config only if it exists" am: 5e5b52033c am: 66a74eb2cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1685486

Change-Id: Ibae815bcb6a8a5d0d8298840c19eb6ec7038e9d2
2021-04-26 17:34:04 +00:00
Bowgo Tsai 610286a88f Moving debug ramdisk resources under / of the ramdisk
Currently the debug ramdisk resources might be under / or
/first_stage_ramdisk of the ramdisk, and is determined by
some BOARD variables, e.g., BOARD_USES_RECOVERY_AS_BOOT,
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT, etc.

To make a generic boot-debug.img that can work on both devices,
let's move the debug resources always under / of the ramdisk.

Bug: 186082603
Test: boot a device with boot-debug.img
Test: boot a device with vendor_boot-debug.img
Change-Id: I55dc8ff322f6b97e2d6dc1a4ee5935e863f2f835
2021-04-24 08:55:02 +08:00
Jeongik Cha 35bf6b0219 Copy dexpreopt.config only if it exists
Bug: 158843648
Test: m dist when global dexpreopt.config doesn't exist
Change-Id: Iaa8ec04624e16cecceed3f2065945a180a867b1c
2021-04-23 20:15:26 +09:00
Treehugger Robot c572c6dc7a Merge "Store dexpreopt.config files to dexpreopt_config.zip" am: 6edaa353b1 am: 543f6750c9 am: 0a1e0a5914
Original change: https://android-review.googlesource.com/c/platform/build/+/1666808

Change-Id: Ic836d95701bab97c0f9b579e03724b4a10a80545
2021-04-23 08:10:51 +00:00
Treehugger Robot 0a1e0a5914 Merge "Store dexpreopt.config files to dexpreopt_config.zip" am: 6edaa353b1 am: 543f6750c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1666808

Change-Id: I8ddadc92ff9d002954ab70b885c3a8052f88ca03
2021-04-23 07:46:03 +00:00
Treehugger Robot 6edaa353b1 Merge "Store dexpreopt.config files to dexpreopt_config.zip" 2021-04-23 06:47:57 +00:00
Jeongik Cha a8056d6cb9 Store dexpreopt.config files to dexpreopt_config.zip
To dexpreopt in post processing, store config files for dexpreopt

Bug: 158843648
Test: m dist and check dexpreopt_config.zip
Change-Id: I5c63a5ffc10023994b14e3a63f50defb9194739f
2021-04-23 01:01:31 +00:00
Chris Wailes 095bc7d668 Update init.rc prebuilt handling
This CL modifies the build system to skip checking of init.rc files if
TARGET_BUILD_UNBUNDLED is set.  This is necessary because several of the
artifacts required by the host_init_verifier program aren't present in
unbundled builds.

Test: m
Change-Id: I37be43af81057c5adddc1b80a04d74a090183bc7
2021-04-22 16:15:17 -07:00
Treehugger Robot 40dcd7c2a6 Merge "Enforce debugfs restrictions for S launching devices and newer" am: 9fd3b6a1f9 am: 84bcf8e6c0 am: c1d5201503
Original change: https://android-review.googlesource.com/c/platform/build/+/1668925

Change-Id: I8c28160cf91a9987956c34cd8084a3434994305d
2021-04-22 22:52:40 +00:00
Treehugger Robot c1d5201503 Merge "Enforce debugfs restrictions for S launching devices and newer" am: 9fd3b6a1f9 am: 84bcf8e6c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1668925

Change-Id: I16ff878287ef5eec7b8a9ed5e9630a6726db301d
2021-04-22 22:21:34 +00:00
Treehugger Robot 9fd3b6a1f9 Merge "Enforce debugfs restrictions for S launching devices and newer" 2021-04-22 21:43:18 +00:00
Treehugger Robot ba3c7f14c7 Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" am: 207405719b am: a59a8d70de am: e2823c52fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1676422

Change-Id: I91d6183c6690b6f4fd322e26eb0c49e223637c7f
2021-04-22 17:22:51 +00:00
Treehugger Robot e2823c52fb Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" am: 207405719b am: a59a8d70de
Original change: https://android-review.googlesource.com/c/platform/build/+/1676422

Change-Id: I0554320f0ff37899ec41777f176e0bf8ba69af74
2021-04-22 17:21:00 +00:00
Treehugger Robot 207405719b Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" 2021-04-22 17:03:31 +00:00
Colin Cross 01eabbe6a4 Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8cfb am: 8875d060db am: bec8ecf507
Original change: https://android-review.googlesource.com/c/platform/build/+/1680749

Change-Id: I3ec4e39748865547d50175f623f25ac44cb3c8cc
2021-04-22 01:03:17 +00:00
Colin Cross bec8ecf507 Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8cfb am: 8875d060db
Original change: https://android-review.googlesource.com/c/platform/build/+/1680749

Change-Id: I13d275faae249f10daf4e721a966c10ebb704c17
2021-04-22 00:29:05 +00:00
Colin Cross 37b11b8cfb Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" 2021-04-21 23:15:40 +00:00
Colin Cross e85c66ccea Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS
module-lib and system-server are not supported in Make, remove them
from TARGET_AVAILABLE_SDK_VERSIONS.

Also replace the hardcoded test_current version with the one found in
the prebuilts.

Fixes: 185903998
Test: get_build_var TARGET_AVAILABLE_SDK_VERSIONS
Change-Id: I745fbcf019092ec27a9903c48fdb95e892c02e3e
2021-04-20 10:18:37 -07:00
Treehugger Robot 9c612a36eb Merge "Test changes for build support for test jni_libs" am: f3162034ef am: bcc08a2454 am: ab9ffa8fed
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: Idda39045f8a58b6abe55b09e2ca934643b4603af
2021-04-20 13:47:58 +00:00
Treehugger Robot ab9ffa8fed Merge "Test changes for build support for test jni_libs" am: f3162034ef am: bcc08a2454
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: Ia803969654c14c653c2c4f439d9a725c217f7e1b
2021-04-20 13:20:58 +00:00
Treehugger Robot f3162034ef Merge "Test changes for build support for test jni_libs" 2021-04-20 12:26:30 +00:00
Treehugger Robot e52d2e5dbd Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f am: a74fbc00a0 am: 16a42ccf08
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: I7df1d7b81485aea822a8fdb5bc7adb78bb73ccc9
2021-04-20 07:29:53 +00:00
Treehugger Robot 16a42ccf08 Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f am: a74fbc00a0
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: I3480132f93acdc8ed2997c23fbf089c65a13d8dd
2021-04-20 06:57:04 +00:00
Treehugger Robot 228ef5f05f Merge "Rename ro.product.enforce_debugfs_restrictions" 2021-04-20 06:07:53 +00:00
Treehugger Robot 279ff055a7 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b am: 759af2af07 am: 0a0ebf40a9
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I89dd7773cf3af6ac8e8338454d55253192783e27
2021-04-20 04:00:09 +00:00
Daniel Cardenas 68984aa93a Test changes for build support for test jni_libs
Tested with patches:  aosp/1560314  aosp/1560314/

Bug: 176593487
Test: make tvts aapt
Change-Id: I2a2867726cc39758dfb27a0a12867e20e4af56d7
2021-04-19 20:48:02 -07:00
Treehugger Robot 0a0ebf40a9 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b am: 759af2af07
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: I966d1ace2845b1a4cdb94d9aa4f1d4bc70b8b7ac
2021-04-20 03:18:50 +00:00
Treehugger Robot 66321c193b Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." 2021-04-20 01:16:45 +00:00
Treehugger Robot 5e0a235465 Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2 am: cb760624f0 am: 538d4135dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585

Change-Id: I1294cf6838fb8630c01288c89b2f1ea486fcc358
2021-04-20 00:13:58 +00:00
Treehugger Robot 538d4135dc Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2 am: cb760624f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585

Change-Id: Ie043b2c3080f32dc8b33cf9e3f68953e21c39fad
2021-04-19 23:38:55 +00:00
Treehugger Robot b4863637a2 Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" 2021-04-19 23:00:57 +00:00
Hridya Valsaraju 31b2e3e388 Rename ro.product.enforce_debugfs_restrictions
Rename ro.product.enforce_debugfs_restrictions appropriately to
ro.product.debugfs_restrictions.enabled as per the sysprop naming
scheme.

Test: build, boot
Bug: 184381659
Change-Id: I65265098caf6382583aa53811f1b3330e58141c0
2021-04-19 17:41:25 +00:00
yangbill 877586c8c8 Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined.
To prevent the argument be cleaned if the same module name with
different unit_test value, treat it as unit test if one of the module is
treated as unit tests.

Bug: 176096135
Test: m out/target/product/generic/module-info.json
Change-Id: Iee4ee1063d47dcba1aaf915ec9e4e56f8c7df787
2021-04-19 20:34:07 +08:00
Colin Cross 79213b8be4 Merge "Do not run "mkdir ./" in codebase root directly" am: 06b891d2bd am: eb325a8841 am: adb57257a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1675586

Change-Id: I2fc256f1debd4256c2393a2a5c4e69573b994fdd
2021-04-16 21:40:47 +00:00
Colin Cross adb57257a3 Merge "Do not run "mkdir ./" in codebase root directly" am: 06b891d2bd am: eb325a8841
Original change: https://android-review.googlesource.com/c/platform/build/+/1675586

Change-Id: Ib7674ac54b0669029736af11b8dbcdd8aaae0e66
2021-04-16 21:18:31 +00:00
Liz Kammer 5b6f5a7bcc Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path
Soong supports references to other modules for vintf_fragments property,
so full paths need to be passed from Soong to make rather than module
local paths.

Test: m droid
Bug: 184567830
Change-Id: Ia7f1cf977de8aeb08d41624277ff6231198222e5
2021-04-16 16:40:59 -04:00
Colin Cross 06b891d2bd Merge "Do not run "mkdir ./" in codebase root directly" 2021-04-16 20:30:27 +00:00
Jimmy Chen 647cffd753 Merge "Fix soong_config handling of CompressedApex" am: 507e84a266 am: 44e5a6a9c6 am: ed5adb9164
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811

Change-Id: I870b0ec1a1f7224662b7c6f808ea381eaaad7461
2021-04-16 10:50:52 +00:00
Jimmy Chen ed5adb9164 Merge "Fix soong_config handling of CompressedApex" am: 507e84a266 am: 44e5a6a9c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1675811

Change-Id: Ib0889803ce19054106ce9e8b6522204f5b86324c
2021-04-16 10:23:08 +00:00
Jimmy Chen 507e84a266 Merge "Fix soong_config handling of CompressedApex" 2021-04-16 09:38:03 +00:00
Anton Hansson 106e11cfe7 Fix soong_config handling of CompressedApex
add_json_bool treats non-empty variable as "true" by default (which is
conventional in make). Fix treatment of PRODUCT_COMPRESSED_APEX to
support the value false.

Bug: 185537646
Test: OVERRIDE_PRODUCT_COMPRESSED_APEX=false m nothing && \
      grep CompressedApex out/soong/soong.variables
Change-Id: I0562a375be377ab67a1d064e37aff5970c4ac8dd
2021-04-16 10:09:58 +01:00
Elvis Chien 064d91c49b Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds
CFI has been enabled for 32-bit builds but this option
still only works for 64-bit builds

Bug: 179233410

Change-Id: I3a9fed728489021f6c062ad45082b0a2705cec51
2021-04-16 15:31:55 +08:00
Jaewoong Jung 9ddcdfda8d Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308 am: 4933028a4b am: 533b8d05b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851

Change-Id: Ifc4b8ed7e1ecc2c01e4282c7cce8cc1076192637
2021-04-15 17:58:43 +00:00
Jaewoong Jung 533b8d05b6 Merge "Add a missing dependency to the prebuilt app rule." am: 08eb6d9308 am: 4933028a4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1673851

Change-Id: If09100eb39bf6040088f42f493fd8bb2a4225e9f
2021-04-15 17:09:05 +00:00
Jaewoong Jung 08eb6d9308 Merge "Add a missing dependency to the prebuilt app rule." 2021-04-15 16:07:40 +00:00
Ulyana Trafimovich 27d5b19988 Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302 am: 497baa7fdc am: a442d28d9e
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313

Change-Id: I3be43582140dac66b4a356513e305962dcf8837c
2021-04-15 10:58:37 +00:00
Ulyana Trafimovich a442d28d9e Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." am: a43c4ff302 am: 497baa7fdc
Original change: https://android-review.googlesource.com/c/platform/build/+/1673313

Change-Id: I315eb53520023ab898e05e37901202bde940d0b2
2021-04-15 10:22:56 +00:00
Ulyana Trafimovich a43c4ff302 Merge "Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES." 2021-04-15 08:23:34 +00:00
Yo Chiang 45b7da678b Merge "Support building recovery as standalone ramdisk in vendor_boot v4" am: 1d1571e543 am: d1060db729 am: eed6d46645
Original change: https://android-review.googlesource.com/c/platform/build/+/1664082

Change-Id: I32c59174d7a4e395362c874ec41d8b5179cfc307
2021-04-15 05:51:22 +00:00
Treehugger Robot 6933b880b8 Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." am: 99802c7544 am: 32f54ff730 am: d0724a792a
Original change: https://android-review.googlesource.com/c/platform/build/+/1671971

Change-Id: I5ba6fe2210d739929b332572981d8351f21acc4a
2021-04-15 05:50:56 +00:00
Yo Chiang eed6d46645 Merge "Support building recovery as standalone ramdisk in vendor_boot v4" am: 1d1571e543 am: d1060db729
Original change: https://android-review.googlesource.com/c/platform/build/+/1664082

Change-Id: I6a59c787498f762cc68a678a76c28b9e89ec40e4
2021-04-15 05:21:13 +00:00
Treehugger Robot d0724a792a Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." am: 99802c7544 am: 32f54ff730
Original change: https://android-review.googlesource.com/c/platform/build/+/1671971

Change-Id: If1adec82ce3c87242b5252faa69cb6702b876a7a
2021-04-15 05:21:00 +00:00
Yo Chiang 1d1571e543 Merge "Support building recovery as standalone ramdisk in vendor_boot v4" 2021-04-15 04:02:15 +00:00
Treehugger Robot 99802c7544 Merge "Fix evaluation order of (Cfi|Memtag) exclude paths." 2021-04-15 03:49:38 +00:00
Paul Duffin d048e75b34 Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf am: 49cd9fb8f6 am: 8b8ec66ed9
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810

Change-Id: Iac9edd812791ba2a9c98ddb505c252f7a628cb5a
2021-04-14 23:34:11 +00:00
Paul Duffin 8b8ec66ed9 Merge "Make sure that BootJars is super set of ArtApexJars" am: 4d414336cf am: 49cd9fb8f6
Original change: https://android-review.googlesource.com/c/platform/build/+/1675810

Change-Id: I64d281b7eaf8772f5d09b130ca79f5789fc18e39
2021-04-14 22:48:15 +00:00
Paul Duffin 4d414336cf Merge "Make sure that BootJars is super set of ArtApexJars" 2021-04-14 21:24:37 +00:00
Ivan Lozano 65fe71b643 Merge "Add Rust vendor image support to Make." am: 1e3771f9ed am: 559d79a186 am: b2cb6487eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566

Change-Id: I9cb899868ef1fc7f6c851962b88718bdc796701d
2021-04-14 20:39:57 +00:00
Ivan Lozano b2cb6487eb Merge "Add Rust vendor image support to Make." am: 1e3771f9ed am: 559d79a186
Original change: https://android-review.googlesource.com/c/platform/build/+/1666566

Change-Id: I2f52c52390da266fc89e0169c597f25431ab1b7e
2021-04-14 19:53:22 +00:00
Paul Duffin d418e961c8 Make sure that BootJars is super set of ArtApexJars
When constructing the dexpreopt config it will strip out any entries in
ART_APEX_JARS which are not present in PRODUCT_BOOT_JARS and store the
remainder in ArtApexJars.

Bug: 185391652
Test: lunch sdk_phone_x86_vendor && m nothing
      lunch sdk_phone_x86 && m nothing
Change-Id: I403ef9768a8ac2d222bbd6cfd0a68a2019f67c16
2021-04-14 20:35:58 +01:00
Ivan Lozano 1e3771f9ed Merge "Add Rust vendor image support to Make." 2021-04-14 19:02:48 +00:00
Jeffrey Vander Stoep 233397c145 Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 am: f32b226103 am: bcc9be437c
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: Ia6c27e65118c437cfb3edd6bac8e16cbd88dc661
2021-04-14 10:13:17 +00:00
Po Hu e1e871db1a Do not run "mkdir ./" in codebase root directly
Test: grep "mkdir -p \.\/" out/build-*.ninja
Bug: 185197550
Change-Id: Ic9568ff91006b0cf362d5b5b105eb25ea3e228a8
2021-04-14 17:39:21 +08:00
Jeffrey Vander Stoep bcc9be437c Merge "Add test configuration for rust benchmarks." am: 4cce23d7d5 am: f32b226103
Original change: https://android-review.googlesource.com/c/platform/build/+/1566318

Change-Id: If769070a94cdf40e4f6520b95bf908c842436dbf
2021-04-14 09:23:28 +00:00
Jeffrey Vander Stoep 4cce23d7d5 Merge "Add test configuration for rust benchmarks." 2021-04-14 08:02:46 +00:00
Bill Yi 21e8c35b78 Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
Merged-In: I6f5f1dc87e27e7c2966d03cfe7992ccfe96de7d1
Merged-In: I9ae926913e3b6409e4b5ffff40ee72b2f42290ea
Change-Id: Icdb6feab48152418ee3e3d44a6d039225a11dbbf
2021-04-13 19:31:56 -07:00
Jaewoong Jung d3561eaef0 Add a missing dependency to the prebuilt app rule.
Fixes: 185197439
Test: Manual test with the CLs cherry-picked.
Change-Id: I595d02497c6504d06239bf2e3562a5448b88b346
2021-04-13 15:03:05 -07:00
Paul Scovanner b862fdf0a8 Update Security String to 2021-06-05 am: deaeaecae3 am: 9c4bacfd42
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: I1d608ce127533022dc576b27ac0d5187894134b0
2021-04-13 18:06:45 +00:00
Paul Scovanner 7d063238d8 Update Security String to 2021-06-05 am: deaeaecae3 am: 307e58c439
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Id6d3fb94d0a7ec24017601ad32e42ba16246219b
2021-04-13 17:40:50 +00:00
Mitch Phillips 74ef52d288 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 am: c007630a9a am: 378b93caa0
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

Change-Id: I213346ebd4be0cd8bab1ce145e09f8719b0d9c5c
2021-04-13 17:17:49 +00:00
Ulyana Trafimovich 4583b26c3f Merge "Don't expect all Java modules to have a manifest." am: 27db0284d0 am: 8b46006319 am: 266ddfaf9a
Original change: https://android-review.googlesource.com/c/platform/build/+/1669905

Change-Id: I3a659cb0f6cb578277dda5a3243070652d788410
2021-04-13 17:17:26 +00:00
Paul Scovanner 9c4bacfd42 Update Security String to 2021-06-05 am: deaeaecae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Id6b1cda27703c59d7a9760ddd71dda60785f7b2e
2021-04-13 17:17:04 +00:00
Paul Scovanner 307e58c439 Update Security String to 2021-06-05 am: deaeaecae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14161908

Change-Id: Ia0f6f832cfc4e1cabc3d996159a682d911eee972
2021-04-13 17:12:13 +00:00
Evgenii Stepanov 13bc227ef0 Fix evaluation order of (Cfi|Memtag) exclude paths.
Before this change, exclude paths disabled sanitization of targets that
would otherwise be enabled by SanitizeDevice product variable (aka
SANITIZE_TARGET).

With this change, in addition to the above logic, exclude path disables
sanitization of targets that would otherwise be enabled by the
corresponding include path.

Effectively, this change disables sanitization of targets that are
covered by *both* include and exclude paths.

Test: MEMTAG_HEAP_SYNC_INCLUDE_PATHS=system/extras \
      MEMTAG_HEAP_EXCLUDE_PATHS=system/extras/su m su && \
      readelf -n path/to/su | grep .note.android.memtag
Bug: b/184976817
Change-Id: Ifa44b85556c6468fe5a37b5e6864c4ce9561ae2b
2021-04-13 10:11:58 -07:00
Mitch Phillips 378b93caa0 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." am: 002dd30e94 am: c007630a9a
Original change: https://android-review.googlesource.com/c/platform/build/+/1674007

Change-Id: I63bc93527591b28b13189c5880f6c9097e21b4ce
2021-04-13 16:27:14 +00:00
Ulyana Trafimovich 266ddfaf9a Merge "Don't expect all Java modules to have a manifest." am: 27db0284d0 am: 8b46006319
Original change: https://android-review.googlesource.com/c/platform/build/+/1669905

Change-Id: I5d7389a581381235aa183ba9ab92f5c9d643f382
2021-04-13 16:26:40 +00:00
Ulya Trafimovich affbaed3be Regroup conditions related to LOCAL_ENFORCE_USES_LIBRARIES.
No functional changes.

Bug: 132357300
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: Ia43ac9306c40df5bec525ae1b245add57f568ee5
2021-04-13 17:26:28 +01:00
Mitch Phillips 002dd30e94 Merge "[MTE] [CFI] Fix CFI -> diag promotion with memtag_heap." 2021-04-13 15:31:14 +00:00
Ulyana Trafimovich 27db0284d0 Merge "Don't expect all Java modules to have a manifest." 2021-04-13 15:16:37 +00:00
Yo Chiang 717c238d65 Merge "Support installing modules.options file" am: 7a8965c1fb am: a074c7db37 am: d1131447db
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: I6ca52534fef5d251e971b488d22fabc953a2176e
2021-04-13 14:20:00 +00:00
Yo Chiang d1131447db Merge "Support installing modules.options file" am: 7a8965c1fb am: a074c7db37
Original change: https://android-review.googlesource.com/c/platform/build/+/1664083

Change-Id: If8c2e67437e3008e177633a9cb3bce6d706d9c4b
2021-04-13 13:22:43 +00:00
Ulya Trafimovich 6ef5779c98 Don't expect all Java modules to have a manifest.
Some libraries that go through manifest_check do not have a manifest or
APK, so there is nothing to check LOCAL_USES_LIBRARIES and
LOCAL_OPTIONAL_USES_LIBRARIES against. Handle it as if the manifest had
zero <uses-library> tags: don't fail the build unless the module has
non-empty LOCAL_USES_LIBRARIES or LOCAL_OPTIONAL_USES_LIBRARIES.

Bug: 132357300
Test: lunch cf_x86_64_phone-userdebug && m
Change-Id: I4b1317cfbd93cb6129caba51b56081307a564442
2021-04-13 12:42:44 +01:00
Yo Chiang 7a8965c1fb Merge "Support installing modules.options file" 2021-04-13 09:20:24 +00:00
Peter Collingbourne 5695ee0248 Merge "Only link the MTE notes against executables." am: ffa65ba8f0 am: 309b414c20 am: 9199e4c04d
Original change: https://android-review.googlesource.com/c/platform/build/+/1673866

Change-Id: I5b3e3603bb605f851b9f50f86b7cad817112e5a1
2021-04-12 23:48:27 +00:00
Hridya Valsaraju 408d898a43 Enforce debugfs restrictions for S launching devices and newer
Starting with Android R, debugfs cannot be mounted on production
devices. In order to minimize the differences w.r.t debugfs between user
and userdebug/eng builds, enforce a set of run-time and build-time
restrictions on debugfs access for S launch devices and newer. For
non-user builds, debugfs can still be accessed by root and by the
dumpstate HAL during bugreport collection.

Bug: 184381659
Test: build/boot
Change-Id: I2af49acd8a5b3440c6ecbf365ab43cdb33ff897a
2021-04-12 16:34:27 -07:00
Peter Collingbourne 9199e4c04d Merge "Only link the MTE notes against executables." am: ffa65ba8f0 am: 309b414c20
Original change: https://android-review.googlesource.com/c/platform/build/+/1673866

Change-Id: I40edc800fa73b5338cd9570dfe81cc7a3e27d401
2021-04-12 23:00:15 +00:00
Mitch Phillips 77e037c887 [MTE] [CFI] Fix CFI -> diag promotion with memtag_heap.
Small typo in the AndroidMk sanitizer config, where adding heap MTE
ended up promoting CFI to diagnostic CFI accidentally, where this isn't
a valid transformation.

Bug: 184397138
Test: lunch aosp_sunfish-userdebug
Test: PRODUCT_MEMTAG_HEAP_ASYNC_INCLUDE_PATHS=\
Test: "hardware/qcom frameworks/opt/net/wifi" \
Test: CFI_INCLUDE_PATHS=hardware/qcom \
Test: m libwifi-hal
Change-Id: I74a03debf0042f2ee004503dd4a0e81131bd9fde
2021-04-12 15:35:47 -07:00
Peter Collingbourne ffa65ba8f0 Merge "Only link the MTE notes against executables." 2021-04-12 21:26:05 +00:00
Paul Scovanner deaeaecae3 Update Security String to 2021-06-05
Bug: 185154903
Change-Id: Ibfaf0bcc7e4525786eca62cafc7548030be40c61
2021-04-12 21:03:24 +00:00
Liz Kammer 5a3c65f9f5 Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" am: 5f2d88bee8 am: f58b8533ed am: 8ccfb3b13b
Original change: https://android-review.googlesource.com/c/platform/build/+/1665419

Change-Id: I3bc7c1505cd8afff738d2b0cc3ec023715a5f1a7
2021-04-12 20:59:48 +00:00
Liz Kammer 8ccfb3b13b Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" am: 5f2d88bee8 am: f58b8533ed
Original change: https://android-review.googlesource.com/c/platform/build/+/1665419

Change-Id: I736cacd89b2607ee0d857e3cd8670e99c0a43ff8
2021-04-12 20:09:10 +00:00
Liz Kammer 5f2d88bee8 Merge "Add LOCAL_FULL_INIT_RC to handle init_rc full path" 2021-04-12 19:05:27 +00:00
Peter Collingbourne 8b80f3e4d5 Only link the MTE notes against executables.
Soong has equivalent logic but it was missing on the .mk side.

Bug: 135772972
Change-Id: I5fc5a387313f6ae43c6510ee63d153aa81fb58b1
2021-04-12 12:04:29 -07:00
Yo Chiang 6aa3381900 Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" am: 71c7048593 am: 88b910385f am: fbfd3e96ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1671806

Change-Id: Ibb619873cf0d9efa517d484d1a3fedc3d6284fd4
2021-04-12 05:57:26 +00:00
Yo Chiang fbfd3e96ef Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" am: 71c7048593 am: 88b910385f
Original change: https://android-review.googlesource.com/c/platform/build/+/1671806

Change-Id: I1d84aef53b26c067707d16575fe0fa70f9aaaae2
2021-04-12 05:07:55 +00:00
Yo Chiang 71c7048593 Merge "Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS" 2021-04-12 03:33:37 +00:00
Yi-Yo Chiang 378b77929f Strip whitespace from INTERNAL_VENDOR_RAMDISK_FRAGMENTS
aosp/1664081 introduces a bug where if BOARD_VENDOR_RAMDISK_FRAGMENTS is
empty, then INTERNAL_VENDOR_RAMDISK_FRAGMENTS would become " " (single
whitespace).
Just unconditionally $(strip ...) the variable to remove any extra
whitespace.

Bug: 183395459
Test: m dist and check *-target_files-*.zip
Change-Id: Ic842756f3a64c073593592d22c980820664e11c1
2021-04-09 12:32:41 +00:00
Treehugger Robot b1e57555b4 Merge "Fix build break for Android.bp dex_import" am: b2fccdd318 am: b6f695193e am: 823cf7297a
Original change: https://android-review.googlesource.com/c/platform/build/+/1644082

Change-Id: Ie4e4d18ca96fa283774a47723a137171ac2d13e3
2021-04-09 08:04:25 +00:00
Treehugger Robot 823cf7297a Merge "Fix build break for Android.bp dex_import" am: b2fccdd318 am: b6f695193e
Original change: https://android-review.googlesource.com/c/platform/build/+/1644082

Change-Id: I67a237d01d713e8af1cced27ad940a5ec20b3a2c
2021-04-09 07:17:15 +00:00
Treehugger Robot b2fccdd318 Merge "Fix build break for Android.bp dex_import" 2021-04-09 06:00:27 +00:00
Yi-Yo Chiang 12f92447a5 Support building recovery as standalone ramdisk in vendor_boot v4
If BOARD_BOOT_HEADER_VERSION >= 4,
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is true and
BOARD_INCLUDE_RECOVERY_RAMDISK_IN_VENDOR_BOOT is true, then build
recovery as a standalone ramdisk fragment in vendor_boot image.

The recovery ramdisk would be a vendor ramdisk fragment packaged in
vendor_boot, whose ramdisk_name is "recovery" and ramdisk_type is
"VENDOR_RAMDISK_TYPE_RECOVERY".

Bootloader can omit loading the recovery ramdisk during normal boot to
optimize the size of the initramfs.

Bug: 183395459
Test: Presubmit
Test: Modify BoardConfig of CF and m dist. Verify the vendor_boot.img
  with unpack_bootimg.
Test: Strip the vendor_boot of the recovery ramdisk, and verify that CF
  can boot to normal boot without the recovery ramdisk.
Change-Id: I6e9a2781ec87aece10d4844fa18bbe9a7b4674e6
2021-04-09 12:47:00 +08:00
Treehugger Robot aa2f6f2e3f Merge "Add a build flag to turn on debugfs restrictions" am: fb65e89346 am: 3de9fa6182 am: e252975036
Original change: https://android-review.googlesource.com/c/platform/build/+/1663700

Change-Id: I4f14fbcbcf7dbc509a48f1e1b350a7747a59b6c8
2021-04-09 01:30:32 +00:00
Treehugger Robot e252975036 Merge "Add a build flag to turn on debugfs restrictions" am: fb65e89346 am: 3de9fa6182
Original change: https://android-review.googlesource.com/c/platform/build/+/1663700

Change-Id: I52a23bfb501b26794b29d424c72c544491ab491e
2021-04-09 01:24:23 +00:00
Treehugger Robot fb65e89346 Merge "Add a build flag to turn on debugfs restrictions" 2021-04-09 00:12:02 +00:00
Treehugger Robot a12445c548 Merge "Remove all unused, legacy FDO build rules" am: f0ed29862f am: c629d903e4 am: c4e811e8d1
Original change: https://android-review.googlesource.com/c/platform/build/+/1663788

Change-Id: Iea4f373cab5dec8a38aa829ef2fff0b812377bca
2021-04-08 20:29:31 +00:00
Treehugger Robot c135ff5fff Merge "Remove legacy host shared library linking with gcov" am: 13ebf1bdf5 am: 46f79f24be am: e3bc7f3a79
Original change: https://android-review.googlesource.com/c/platform/build/+/1663784

Change-Id: Ib343d55e450bc539fdfc913e33d0e0cbf8cee41e
2021-04-08 20:29:10 +00:00
Treehugger Robot c4e811e8d1 Merge "Remove all unused, legacy FDO build rules" am: f0ed29862f am: c629d903e4
Original change: https://android-review.googlesource.com/c/platform/build/+/1663788

Change-Id: I59746b75f3c05d8e2febb9989d3ed70a5da8fd9d
2021-04-08 20:02:11 +00:00
Treehugger Robot e3bc7f3a79 Merge "Remove legacy host shared library linking with gcov" am: 13ebf1bdf5 am: 46f79f24be
Original change: https://android-review.googlesource.com/c/platform/build/+/1663784

Change-Id: I97bbe6c601e99a708845e268d1fdd89bca6f2355
2021-04-08 20:01:34 +00:00
Colin Cross b7d61d8776 Merge "Package jacoco and proguard files out of a PACKAGING directory" am: df682c6fe1 am: 20f7c8aa14 am: c501f5e0ae
Original change: https://android-review.googlesource.com/c/platform/build/+/1666060

Change-Id: Icb09a21be58fc92f90ab48649049759948a1d914
2021-04-08 19:25:19 +00:00
Colin Cross c501f5e0ae Merge "Package jacoco and proguard files out of a PACKAGING directory" am: df682c6fe1 am: 20f7c8aa14
Original change: https://android-review.googlesource.com/c/platform/build/+/1666060

Change-Id: Icfcc9ecf69ab23309ba1f4a1626a95d0ec82c997
2021-04-08 18:38:39 +00:00
Treehugger Robot f0ed29862f Merge "Remove all unused, legacy FDO build rules" 2021-04-08 18:31:40 +00:00
Treehugger Robot 13ebf1bdf5 Merge "Remove legacy host shared library linking with gcov" 2021-04-08 18:31:08 +00:00
Colin Cross df682c6fe1 Merge "Package jacoco and proguard files out of a PACKAGING directory" 2021-04-08 17:17:53 +00:00
Liz Kammer 382be36c43 Add LOCAL_FULL_INIT_RC to handle init_rc full path
Soong supports references to other modules for init_rc property, so full
paths need to be passed from Soong to make rather than module local
paths.

Test: m droid dist
Bug: 184567830
Change-Id: Ib1873a3418830f5cbf32e26f55d3ad0ab0d9c9c5
2021-04-08 11:33:46 -04:00
Treehugger Robot b52b0c027c Merge "Use BOARD_API_LEVEL to define ro.board.api_level" am: 222b4ab071 am: bcadcb4c8f am: cd2621f177
Original change: https://android-review.googlesource.com/c/platform/build/+/1662022

Change-Id: I5e92476f760690139018c7b7bc2d0e3f9f5ee0f9
2021-04-08 02:21:14 +00:00
Colin Cross 330b1fef31 Package jacoco and proguard files out of a PACKAGING directory
Package jacoco-report-classes.jar, proguard_usage.zip and
proguard_dictionary out of directories in $OUT/obj/PACKAGING
so that they get cleared by m installclean.  This will make
incremental builds that package these files accurate as long
as installclean was run, which is much faster than a full clean
build.

Bug: 184583915
Test: m TARGET_BUILD_APPS=DeskClock EMMA_INSTRUMENT=true dist
Change-Id: I60c6a0fec1fbce26eab8d5adab25a2231b48e251
2021-04-07 18:52:02 -07:00
Treehugger Robot cd2621f177 Merge "Use BOARD_API_LEVEL to define ro.board.api_level" am: 222b4ab071 am: bcadcb4c8f
Original change: https://android-review.googlesource.com/c/platform/build/+/1662022

Change-Id: I814dd8f01e6334cbe9f9973fc271a21ba0d94fcb
2021-04-08 01:36:27 +00:00
Treehugger Robot 222b4ab071 Merge "Use BOARD_API_LEVEL to define ro.board.api_level" 2021-04-08 00:15:06 +00:00
Hridya Valsaraju b39ec7084a Add a build flag to turn on debugfs restrictions
Starting with Android R launched devices, debugfs cannot be mounted in
production builds. In order to avoid accidental debugfs dependencies
from creeping in during development with userdebug/eng builds, this
patch introduces a build flag that can be set by vendors to enforce
additional debugfs restrictions for userdebug/eng builds. The same flag
will be used to enable sepolicy neverallow statements to prevent new
permissions added for debugfs access.

Bug: 184381659
Test: make with/without PRODUCT_SET_DEBUGFS_RESTRICTIONS
Change-Id: I9aff974da7ddce9bf1a7ec54153b161527b12062
2021-04-07 16:47:59 -07:00
Ivan Lozano ae2274b5a2 Add Rust vendor image support to Make.
This adds the requisite Make logic to handle Rust vendor modules.

Bug: 184042776
Test: Example cc_library vendor module can depend on rust_ffi_shared.
Test: Example rust_library vendor-only module compiles.
Change-Id: Ib5ef6b403ca7e19a2aac9b77ff08b051425ea019
2021-04-07 16:25:55 -04:00
Rupert Shuttleworth 39dabbfd2f Merge "Mark prop file as writable before writing to it." am: 90eeff54ea am: 185080ab39 am: 6f3d332a52
Original change: https://android-review.googlesource.com/c/platform/build/+/1666239

Change-Id: I1b63d12bc9467f58b23a6b3e0aef221807d8f539
2021-04-07 14:53:49 +00:00
Rupert Shuttleworth 6f3d332a52 Merge "Mark prop file as writable before writing to it." am: 90eeff54ea am: 185080ab39
Original change: https://android-review.googlesource.com/c/platform/build/+/1666239

Change-Id: Iaf415232101487925d4c5b79a49c4a41d8f7c334
2021-04-07 14:08:12 +00:00
Rupert Shuttleworth 90eeff54ea Merge "Mark prop file as writable before writing to it." 2021-04-07 12:40:34 +00:00
Treehugger Robot a31becc1ed Merge "Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET." am: d641585484 am: 450d1d1349 am: 67b869e3d4
Original change: https://android-review.googlesource.com/c/platform/build/+/1664602

Change-Id: I612be38afd832d1f83d03aea74c560cc0e779aa0
2021-04-07 04:21:16 +00:00
Treehugger Robot 67b869e3d4 Merge "Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET." am: d641585484 am: 450d1d1349
Original change: https://android-review.googlesource.com/c/platform/build/+/1664602

Change-Id: Icd0aabce521f440321cbb37fc718814096d6fe9a
2021-04-07 03:28:25 +00:00
Treehugger Robot d641585484 Merge "Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET." 2021-04-07 02:05:36 +00:00
Rupert Shuttleworth 3993af706c Mark prop file as writable before writing to it.
Test: Fixes USE_BAZEL=1 m builds.
Change-Id: I1e0fb448049ff21cd32541af56e856442bc25fa7
2021-04-07 01:22:00 +00:00
Ryan Prichard bc98e53fe8 Merge "Stop linking against libatomic" am: 5727dc3dd1 am: 011859f1c8 am: 11411e1ce3
Original change: https://android-review.googlesource.com/c/platform/build/+/1663879

Change-Id: Ied846bc477c10f3b5c7c4129ceed0d96c7aed3a2
2021-04-07 00:15:50 +00:00
Ryan Prichard 11411e1ce3 Merge "Stop linking against libatomic" am: 5727dc3dd1 am: 011859f1c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1663879

Change-Id: I11b145eae24128fbe3c3b8a4b58677043e84ca66
2021-04-06 23:27:37 +00:00
Ryan Prichard 5727dc3dd1 Merge "Stop linking against libatomic" 2021-04-06 21:43:33 +00:00
Yo Chiang 0e38bfa5bb Merge "Refactor vendor_boot v4 build logic and add more checks" am: bebc8a35ef am: f19a789d5b am: ba7020ec3d
Original change: https://android-review.googlesource.com/c/platform/build/+/1664081

Change-Id: I10838451c8e3d55c2f4ba7e2dd6db272c9666cb3
2021-04-06 11:06:50 +00:00
Jakub Kotur f8735bc4f3 Add test configuration for rust benchmarks.
Same as rust tests with additional parameter.

Test: atest <module with rust_benchmark defined>
Bug: 155309706
Change-Id: Ia734c17bcb0776bbc628ad1e7257a1b38cdb2e4e
2021-04-06 12:41:10 +02:00
Yo Chiang ba7020ec3d Merge "Refactor vendor_boot v4 build logic and add more checks" am: bebc8a35ef am: f19a789d5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1664081

Change-Id: I93bede273ca12bb17aa431df8b70ea5f9b5a86f6
2021-04-06 10:19:34 +00:00
Yo Chiang 1ef1bc87a7 Merge "Fix Makefile formatting" am: b5bff9a4d3 am: a7a67e0358 am: fb51a1d107
Original change: https://android-review.googlesource.com/c/platform/build/+/1664080

Change-Id: Ied00b66168177c9c6f5f9d76c7de763f9a936556
2021-04-06 09:22:29 +00:00
Yo Chiang bebc8a35ef Merge "Refactor vendor_boot v4 build logic and add more checks" 2021-04-06 09:02:14 +00:00
Yo Chiang fb51a1d107 Merge "Fix Makefile formatting" am: b5bff9a4d3 am: a7a67e0358
Original change: https://android-review.googlesource.com/c/platform/build/+/1664080

Change-Id: I71ca8cc9afae84378ac46e99eb8bf4f255b1bea2
2021-04-06 08:31:48 +00:00
Bowgo Tsai 1ed0fd54dc Builds boot-test-harness.img, if INSTALLED_BOOTIMAGE_TARGET.
Similar to commit Ic887ea93d4c5181eca0f82c3cdf3ce3b72f4c185
for boot-debug.img, we should also only build boot-test-harness.img
if boot.img exists.

Bug: 184365242
Test: tree hugger

Change-Id: Ie0d9e460905d488e418cf4ee1bd44e6e7c58470d
2021-04-06 08:20:15 +00:00
Justin Yun 07ceaa71c1 Use BOARD_API_LEVEL to define ro.board.api_level
GRF devices must define the API level of which the SoC is first
shipped by setting BOARD_SHIPPING_API_LEVEL. As this is a permanent
value, vendors may not change this value even if they implement new
features under the GRF policy.

BOARD_API_LEVEL can be optionally defined in this case to manually
set the api level of the vendor implementation.
The current api level will be set to `ro.board.api_level` property.

Bug: 176950752
Test: atest --host post_process_props_unittest
Change-Id: Ib126c1a622ded9848650f3f60c0f15005867272d
2021-04-06 16:33:07 +09:00
Yo Chiang b5bff9a4d3 Merge "Fix Makefile formatting" 2021-04-06 07:27:44 +00:00
Treehugger Robot de17763432 Merge "Fix builds with enforce_vintf_kernel + !kernel" am: 3c610dd0aa am: 8163f0b665 am: 75257bca9c
Original change: https://android-review.googlesource.com/c/platform/build/+/1663197

Change-Id: I1adf5e389d32e22f0c34fd7f00ccc4b87b12ef74
2021-04-06 05:07:15 +00:00
Treehugger Robot 75257bca9c Merge "Fix builds with enforce_vintf_kernel + !kernel" am: 3c610dd0aa am: 8163f0b665
Original change: https://android-review.googlesource.com/c/platform/build/+/1663197

Change-Id: I63c23ed361bb357f153f5e3d5667b932a992ef35
2021-04-06 04:19:45 +00:00
Stephen Hines d49aa55cf1 Remove all unused, legacy FDO build rules
There are no current users of this feature. All remaining references are
legacy scripts that aren't actually in-use today.

https://source.corp.google.com/search?q=BUILD_FDO_INSTRUMENT%20-file:build%2F
https://source.corp.google.com/search?q=LOCAL_FDO&ct=os&sq=package:%5Eandroid$

Test: build
Change-Id: I86ff6531a0868fb8e30741f0d04de1739fba4586
2021-04-05 17:13:00 -07:00
Stephen Hines 39e9090e7e Remove legacy host shared library linking with gcov
Test: build
Change-Id: I5f701edcfa9021f75659b6be4790119e6baca51c
2021-04-05 16:29:57 -07:00
Yi-Yo Chiang 9c461365de Fix Makefile formatting
Add indent to if-block so my text editor stop complaining.

Test: Presubmit
Change-Id: Ie3f4dbd114d894453bf46a91b47d5d0450e5e1e7
2021-04-05 12:49:17 +08:00
Yi-Yo Chiang 6c7e02e74e Support installing modules.options file
Usage:
```
BOARD_(VENDOR|VENDOR_RAMDISK)_KERNEL_MODULES_OPTIONS_FILE(_ver) := \
  $(wildcard <path of modules.options in source tree>)
```

Then the modules.options would be installed as
(vendor_dlkm|vendor_ramdisk)/lib/modules/(ver/)modules.options.

Also fix bug where the kernel version subdir is missing when generating
modules.blocklists file.

Bug: 182417593
Bug: 184238876
Test: Create a options file with incorrect syntax, verify build fails
Test: Verify the new macro indeed installs the options file
Change-Id: I7ba56e9dd8d73055bc276446c385a8d79080c2a6
2021-04-04 14:25:47 +00:00
Yi-Yo Chiang 1519d4351e Refactor vendor_boot v4 build logic and add more checks
Add more checks around BOARD_BOOT_HEADER_VERSION in board_config.mk.

Refactor generation logic of vendor_boot ramdisk fragments.
Consolidate initialization and validation check to its own section.
Adjust some variable names and initialization sequence so the follow-up
change can land more cleanly.
Rename variable name "dir" so that it don't collide with the Makefile
function "$(dir ...)".

Bug: 183395459
Test: Presubmit; Change should be no-op with respect to build artifacts.
Test: Modify BoardConfig of CF and m dist. Verify the vendor_boot.img
  with unpack_bootimg.
Change-Id: I8785c40dd9f87f3797a56ada93e65939d27d0e9b
2021-04-04 20:40:17 +08:00
Ryan Prichard 663b98bbab Stop linking against libatomic
The __atomic_* library functions are now part of the compiler-rt
builtins library:

https://android-review.googlesource.com/c/toolchain/llvm_android/+/1625025

Bug: http://b/153025717
Test: treehugger
Change-Id: Iebd5eaf17f8559696b6d6e2e0dd782f77b6bcab5
2021-04-02 21:05:48 -07:00
Yifan Hong 3e061bd1c8 Fix builds with enforce_vintf_kernel + !kernel
If a build has PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
set (which is set for P+ builds) but no kernel is built,
the original code emits a warning, but it won't be able
to build target files package because it depends on
kernel_configs.txt and kernel_version.txt without any rules.

Properly clear BUILT_KERNEL_CONFIGS_FILE and BUILT_KERNEL_VERSION_FILE
so that it won't be depended on in this case.

Bug: 184128489
Test: TH + forrest

Change-Id: I4b8fbd117f114555cf606e3c3b48eb564dbe786b
2021-04-02 16:19:01 -07:00
Elliott Hughes d63b6a1054 Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693 am: a6600c241e
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: I0a6a96a61ec4a195c89fdd3d48a3011f01023a42
2021-04-02 22:56:23 +00:00
Elliott Hughes a6600c241e Merge "Remove honggfuzz support." am: 4ac1818cde am: a526577693
Original change: https://android-review.googlesource.com/c/platform/build/+/1663184

Change-Id: Ia46e509718525427316575db53be1459cedc1949
2021-04-02 22:10:44 +00:00
Elliott Hughes 4ac1818cde Merge "Remove honggfuzz support." 2021-04-02 20:47:05 +00:00